gentoo resync : 20.03.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-03-20 00:40:44 +0000
commit: 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree: 356496503d52354aa6d9f2d36126302fed5f3a73 /net-mail
parent: fcc5224904648a8e6eb528d7603154160a20022f (diff)
60 files changed, 880 insertions, 1068 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 1f0d6761c8fd..d05f7f5a797f 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/b4/Manifest b/net-mail/b4/Manifest
index e20bf95c23a0..ca781ef9ceb2 100644
--- a/net-mail/b4/Manifest
+++ b/net-mail/b4/Manifest
@@ -1,3 +1,3 @@
 DIST b4-0.8.0.tar.gz 66882 BLAKE2B 7f93b9ce9f1f448a1b4be94c692ee93912e273c740c41518fdacd515df7038ba140f62712ef7a6df8a946315eb776ebb7e182d71905ca2ff34771525ceefe4c2 SHA512 4696a0164289eb7077d276a3133ba3776bfc3bfa25fd3591da6e932329f1578fcfe9909419426865ba3239c5b0a7b23dbb85df10307210420ac85e399d8fddd9
-EBUILD b4-0.8.0.ebuild 582 BLAKE2B 2d128089afb02ec116df58c66695bae8435cf4f3f5971483ecf86f5cb0201d29ae3ac19c669f7045524f3fd376bdff37e031f21fb48a007bc4ed06277bf0c521 SHA512 45f8b53181e5db22d9bd4f47e30072abb7567d1076b69e1642981e125a1a2414c26ffd464cc464e476c2fc09c0e4ec3a55f4c70339f7ba99c80ae94aafff1c70
+EBUILD b4-0.8.0.ebuild 583 BLAKE2B 980e0b1a582f3ea28513dcefbe03e50eb2f31b824a8fa2316cd967e10b5034601474e233f152cae3f11a069bd52dd16248ab562f6f707bf53c3ccdaaed94082a SHA512 37e285217fa94bd091b4fa8ae07acd177f2f5a87b91493afe57affac70f76b604bd5d1d91984a1fd245c23f378ed36ab2a91e7f2350fbb6ff2feee7cd66c0500
 MISC metadata.xml 316 BLAKE2B 62d44d71ffd93810f657fb1f8928d9b302d59fedef7ab020affa3bfcd329aed59f604755fd309927d03660adc0b9c540607f3c6a7b6438ab2deb752d07f2ac66 SHA512 9e469a24088924955ef3c2b5357bf9cc763269e190b730619a41be916bf36c4ae869186053a3f87cbfb6f6f435774a974c159ed6e374fb6a4a53bbd8d140c4b7
diff --git a/net-mail/b4/b4-0.8.0.ebuild b/net-mail/b4/b4-0.8.0.ebuild
index 12883cde5aa6..cb89f1393cd1 100644
--- a/net-mail/b4/b4-0.8.0.ebuild
+++ b/net-mail/b4/b4-0.8.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 2020-2021 Gentoo Authors
+# Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit distutils-r1
 
diff --git a/net-mail/checkpassword-pam/Manifest b/net-mail/checkpassword-pam/Manifest
index 7ad1882c905a..867f79f63b57 100644
--- a/net-mail/checkpassword-pam/Manifest
+++ b/net-mail/checkpassword-pam/Manifest
@@ -1,3 +1,3 @@
 DIST checkpassword-pam-0.99.tar.gz 83751 BLAKE2B 398344f6ae8556a40db2d217fe38d20a6f0159bbc7750c3d4c115ca6a383dbfa9018af1f0f5404b34b349e998093307de333434ea0b9b176a9491a48f4d5c044 SHA512 d7c9cbeec7fb15c07dcc3c6e6b7f38884bdf0fd2fe31d3a38b2f6f58deec57716b5d65387b03cb858c1bf5fbb5dce88e0451bf1b866b88fbc17165100040baec
-EBUILD checkpassword-pam-0.99-r1.ebuild 435 BLAKE2B 124de20612fdf2876feccd8c53342489228d855c221defa8dfcc34be3d2ad11a60e95d155e660600673cb2b4685b535c4ad47c5a5ecf9e0a471b835a3be187fe SHA512 c78892b65682b06d4e91b40903090eaa973533b48e9f1190474e409b498c334233614476ecb7499035c9b6b4a87af1529efe40305d509077f4fbce3f7b80467c
+EBUILD checkpassword-pam-0.99-r1.ebuild 443 BLAKE2B a502d5b4883732ea6b318648cab21875591e4aab3418f645f1ec54d9c0f414804ebaf2d8c7ddac133b42a09cb96660b38a66adafa016f685256bc70b6ed0e03f SHA512 4ecd9d3d39ee50fca1ded9dce70d1b2ebb4311dbe1e018c93ca3d9a0a6c51b253a5fca8fa6f2a6663093d9ceea54c2c3a471f4a1440434d3b6fa6e4a1aa15a27
 MISC metadata.xml 253 BLAKE2B b344c7f0acd8e2d4cee9c760e09d877f0aab4cc154cd7f0b7e58aad4b73b1a4590b7db1e01a2ef81f755e188de6737d1134cd5acd22be3879d390df04b32c69d SHA512 474d9d21a4822b0a959822529a28a9b12c7e05b9fcf89be22a373885a1be93d01f1ddff3cf134dcdd1194022c73160675038b066d9970353a0b38ed42f6308cc
diff --git a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
index 634545505455..6ffd859dd6ea 100644
--- a/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
+++ b/net-mail/checkpassword-pam/checkpassword-pam-0.99-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/checkpasswd-pam/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~riscv x86"
 
 DEPEND=">=sys-libs/pam-0.75"
 
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 80a5a9bb5cfc..b0cc00197b82 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -22,7 +22,9 @@ AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d1911
 DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
 DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca
 DIST courier-imap-5.1.4.tar.bz2 3363196 BLAKE2B 272548fcbc560ebf39e63170702de30970bee1e0026c31e0c8f0a6dcf86271565cda1e83e9fe50174aa2db2f9172cfc78132746ca8eb2e6749f16c7e994d0db9 SHA512 33e54e3b369335f5bc234c638c9bf4f68bc39dc9cb6cc5e3e3ba200f72a7b2fcdca6a4f7e35f32f494406f8757749ccf5204be93ecd2edbfabab4b6316d5957c
-EBUILD courier-imap-5.1.2-r1.ebuild 7054 BLAKE2B 930910520e4929cd4daaec943af9c4d57a86823f30ec0a80ece21c72a8c8246109bf16725d45cb3031f58a0f7b2dbcae66fd04033d63bb24b8c71898394fa9ff SHA512 e7f838100718e445a3c60298870c81ea73b55e9d500c0390f738cb6dfca0ffdca6f934485901c1b18a2638dadc4de0d792169662acb6a7f1fdd9524289c6162e
+DIST courier-imap-5.1.7.tar.bz2 3364221 BLAKE2B 8a34595879b6ab249db8d90d0a7845b63503c7e9f1ff449e90311fdc086b6a1486fa9ed748d4eba7541265b958ea58514bafd6c90c88cc21f579705e33e5fe55 SHA512 15f64ea78f34d4a3af9f82a8247907324b26a8c550f5e97930548449fc2e9b649d2b5511de063cf3e449843516e681232a3197f2afb40e18be0f36fd8e05e66d
+EBUILD courier-imap-5.1.2-r1.ebuild 7055 BLAKE2B 490ff0c972159bee1718f0a8f3c51fb0a2789b2f488f9344045950c3d20f908164947c68bada94196972c2cd8b7eb3f9a24a91630646e803fb53d359aeebff1d SHA512 86e7d1a28d6a37dc22471b9c965188f61b4b99ab8e1981f27c4cedb02ce3dbbbb4d8a4d3cfb1ce961a2f9cdc4b4e4c9195bc27651651e889c81f3a93b44f3c0d
 EBUILD courier-imap-5.1.3-r1.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46cccf01853ab7fac27dcd0c5895d5275a61de53350a6b7961739eae42d007fe811b1eecf66e07b955734f46f0d8afff1835 SHA512 e0538948fb23aecc78e5d62f3ec86344e42e751577aac6443f0e556a326a04e51c0ac6b53ce154f0ba53c019f46be3726f13b5b9a7c5576c6c5d07149d588ecf
-EBUILD courier-imap-5.1.4.ebuild 7055 BLAKE2B 52a5dec02c81bffadfb928fe8edbbf9c3d02290921a6eac23f2ffa9e45f4e6efa42518b69e93463554ba3679fc278714032dc631c4ce1ad9568c6eff66fae4aa SHA512 eb98b3b14ad38b33c5b5b2a8dd5a39574ae041fd85c7131a46ed76661d6b5e2e1794acdfe7921c3cd69a3db41fd4020567137e9ea64c181dc57cde88680f8626
+EBUILD courier-imap-5.1.4.ebuild 7056 BLAKE2B 56a06f662daa0b4e45c0ed755c536a2f29f5168cfc84fe62db809de2865cbb4c3e74c2104034d9dce707d9e405c09f4c8523cbd163f7a96adf9669c27446ec3e SHA512 381c68368c66c33f7a0f709ac0b3ab430e5b10b57c0bc12ac6943969c7bb3dca1780bc423437316203fc9ac0d7ab50ae7906ac50cba0fa9302a4d17704c2eb7f
+EBUILD courier-imap-5.1.7.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46cccf01853ab7fac27dcd0c5895d5275a61de53350a6b7961739eae42d007fe811b1eecf66e07b955734f46f0d8afff1835 SHA512 e0538948fb23aecc78e5d62f3ec86344e42e751577aac6443f0e556a326a04e51c0ac6b53ce154f0ba53c019f46be3726f13b5b9a7c5576c6c5d07149d588ecf
 MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950
diff --git a/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild b/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
index b80f70ec18a3..98096cb65fdf 100644
--- a/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/courier-imap/courier-imap-5.1.4.ebuild b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
index 390d83e938d7..4132409817c9 100644
--- a/net-mail/courier-imap/courier-imap-5.1.4.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc x86"
 
 IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
 REQUIRED_USE="|| ( berkdb gdbm )"
diff --git a/net-mail/courier-imap/courier-imap-5.1.7.ebuild b/net-mail/courier-imap/courier-imap-5.1.7.ebuild
new file mode 100644
index 000000000000..d551f9d82941
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-5.1.7.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools readme.gentoo-r1 systemd
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs"
+HOMEPAGE="https://www.courier-mta.org/imap/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="
+	gnutls? ( net-libs/gnutls:=[tools] )
+	!gnutls? (
+		dev-libs/openssl:0=
+	)
+	>=net-libs/courier-authlib-0.71
+	>=net-libs/courier-unicode-2:=
+	>=net-mail/mailbase-0.00-r8
+	net-dns/libidn:=
+	berkdb? ( sys-libs/db:= )
+	fam? ( virtual/fam )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
+"
+DEPEND="${CDEPEND}
+	dev-lang/perl
+	!mail-mta/courier
+	sys-process/procps
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )
+"
+
+# get rid of old style virtual - bug 350792
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/cyrus-imapd
+"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+# make check is not supported by this package due to the
+# --enable-workarounds-for-imap-client-bugs option.
+RESTRICT="test"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
+and remove TLS_DHPARAMS from configuration files or run mkdhparams
+
+For a quick-start howto please refer to
+${PN}-gentoo.readme in /usr/share/doc/${PF}
+
+Please convert maildir to utf8
+and rerun mkdhparams if needed. Location has changed
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
+	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
+)
+
+src_prepare() {
+	default
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
+		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	econf \
+		--with-notice=unicode \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--sysconfdir="/etc/${PN}" \
+		--libexecdir="/usr/$(get_libdir)/${PN}" \
+		--localstatedir="/var/lib/${PN}" \
+		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		--with-certsdir="/etc/courier-imap" \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf}
+}
+
+#src_compile() {
+	# spurious failures with parallel compiles, bug #????
+#	emake -j1
+#}
+
+src_install() {
+	dodir "/var/lib/${PN}" /etc/pam.d
+	keepdir /var/lib/courier-imap
+
+	default
+	rm -r "${D}/etc/pam.d" || die
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	for name in imapd pop3d ; do
+		mv "${D}/usr/sbin/"{,courier-}${name} \
+			|| die "failed to rename ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -e 's/Maildir/${MAILDIR}/' \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
+			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
+			|| die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR}
+	# to them.
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv "${D}/etc/${PN}/${service}"{.dist,} \
+			|| die "failed to rename ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' \
+			 >> "${D}/etc/${PN}/${service}"
+		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
+	done
+
+	for x in "${D}/usr/sbin"/* ; do
+		if [[ -L "${x}" ]] ; then
+			rm "${x}" || die "failed to remove ${x}"
+		fi
+	done
+
+	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
+	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
+
+	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
+
+	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
+
+	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
+			> "${T}/${initd}" \
+			|| die "initd libdir-sed failed"
+		doinitd "${T}/${initd}"
+	done
+
+	cp "${FILESDIR}"/courier-*-r1.service .
+
+	sed -i \
+		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
+		courier-*-r1.service \
+		|| die
+
+	systemd_newunit courier-authdaemond-r1.service \
+					courier-authdaemond.service
+	systemd_newunit courier-imapd-ssl-r1.service \
+					courier-imapd-ssl.service
+	systemd_newunit courier-imapd-r1.service \
+					courier-imapd.service
+
+	exeinto "/usr/$(get_libdir)/${PN}"
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
+			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
+			> "${T}/${exe}" \
+			|| die "exe libdir-sed failed"
+		doexe "${T}/${exe}"
+	done
+
+	# Avoid a collision with mail-mta/netqmail, bug 482098.
+	mv "${D}/usr/sbin/"{,courier-}maildirmake \
+		|| die "failed to rename maildirmake to courier-maildirmake"
+	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
+		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
+
+	dodoc AUTHORS INSTALL NEWS README ChangeLog
+	readme.gentoo_create_doc
+	dodoc "${FILESDIR}/${PN}-gentoo.readme"
+	docinto imap
+	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
+	docinto maildir
+	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
+	docinto rfc2045
+	dodoc libs/rfc2045/*.html
+	docinto tcpd
+	dodoc libs/tcpd/README* libs/tcpd/*.html
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/${PN}.cron ${PN}
+}
+
+pkg_postinst() {
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
+
+	readme.gentoo_print_elog
+
+	elog ""
+	elog "Courier Imap now run as user mail:mail."
+	elog ""
+	elog "This require you to enable read/write access to the caches:"
+	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
+	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
+}
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 9e66e68be95d..93d2b19b9948 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -9,10 +9,14 @@ DIST cyrus-imapd-3.0.13.tar.gz 10840005 BLAKE2B f4790837a198673b42d553bc7cbc8254
 DIST cyrus-imapd-3.0.14.tar.gz 10865880 BLAKE2B 36f3e60d715d2eab430040964e93cb332cfc4d9097f0f863b94325eb4eb964a4030d1d0f8ddb7870a08b655e1694bbc751d5aab99af6670ab33ad6747f55f6bd SHA512 0bade56f4f7834ef51efc4081f2915bf0f98a2a555cd1b847f13a34418e4c52f2abcb4018906c144c161241433a8ff9ddc6d88499804d3fe616a05f186a3f209
 DIST cyrus-imapd-3.0.15.tar.gz 10843341 BLAKE2B efe65c7afc7d63770adef9e4ea13b87e3b7fdd1847e4ada028175999b31ebb84f9d84b014018bd2be3fee9af1b5e81dd08f63225bc62dc5a4fd4a0791da16594 SHA512 2f65209095f086092fec0bfc9547c999a6e568cccc0a4164e7a3751fe2881f47bbbbd67ba9c9169feafead8c40d42f594d34171d911e4028425cfd8ba72d8f4a
 DIST cyrus-imapd-3.0.16.tar.gz 10875516 BLAKE2B 10915418b4de3f460a20d3808274f9ea83bdadc9a9edf2b383081605f7510a3e1563fa009e1dcc203f1c008f26e9db3ffd80f101f546de1dc8c3e714efc13596 SHA512 c17dd940102989d1e329ad8a1c08655bdd8b349ecb08e661f55ab8e602516ece1a86e52313e8cd5677048470f15f4272fcb598e4bbc61d27e5a673c01cb81ca3
+DIST cyrus-imapd-3.0.17.tar.gz 11445224 BLAKE2B bf2cd85f878c1b4198be5ce96cf6a4ae1e4fcc765b0c7fe60a6bfd04dd066c0420f86508cbfc1030831b57c2732715440cbf0e327f5147b074fe12926dcda85f SHA512 75519bf8a2ae4a8ff844338bee641d519eaf3419fb81b819dc7a42e5956ef57569e47a0e094ccb9726a9c43f0469cd3def6c62783565b2a2aaa863bda354a7da
 DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
-EBUILD cyrus-imapd-3.0.13-r3.ebuild 6066 BLAKE2B b2cfa376a54a4887ecf91a93f94139f77d7546966de851f117fbe67617a789cd58176de2921cd027879774fb91ff12be9da8740a93038d6c9a10fcd23536e36d SHA512 58dae45fd21f12d6eb1907fe1e6063139dac6a422dc83cebd1d5dede4c3546de07ce0aafd70ecf25ea143a33e1ee91395fe9c22544b74e2a350e2eea76c0e069
-EBUILD cyrus-imapd-3.0.14-r3.ebuild 6027 BLAKE2B 60f6bd7e02f8ab0edae948c5312e1a18cb1c0b57d026f9280061821173fbf2a4268f558b0d07953210fc051bde5d1d36dac770bd2c817978946a8572e0ef81ef SHA512 539e6596d182291897c5ded61a233b5f308758c8ba2dd5e4ad1fa35cc30bea15d69869148ffafbada3f8da7193ea1b05f11d81107e7bdc0f25dad4ee508fcaaf
-EBUILD cyrus-imapd-3.0.15-r3.ebuild 6013 BLAKE2B cf79eaae8908beae050bad456db821a41930b9dcce2d65934c248dcb0323e53a5088922185c654cb44e411e41465eb9ad3572314bb8e8c1af192aced1dfa40ec SHA512 e104cf0720a00588f4a244d52d918b3bad1b7138b0d707900882be46c6ef96c78c743b0922abec470a92152d7fe2b8db2fef2a4fa6bd38bff3e6f56cf4bf2a16
-EBUILD cyrus-imapd-3.0.16-r1.ebuild 6013 BLAKE2B cf79eaae8908beae050bad456db821a41930b9dcce2d65934c248dcb0323e53a5088922185c654cb44e411e41465eb9ad3572314bb8e8c1af192aced1dfa40ec SHA512 e104cf0720a00588f4a244d52d918b3bad1b7138b0d707900882be46c6ef96c78c743b0922abec470a92152d7fe2b8db2fef2a4fa6bd38bff3e6f56cf4bf2a16
-EBUILD cyrus-imapd-3.4.2-r1.ebuild 5963 BLAKE2B f83308c2130f8aafd106cae53a8a078b7538c9aac0ac9729026b51afde2bfa2581c60c2b2284134dac5aadbabddc907019010ea119ce40afad82a79c123ce795 SHA512 da95de2fa59db1adad3a1782355820afabb259b170833be9882cde5df2baa1c7a491f9c75ea8cf8801942cb525c94ac9daf5b61a037daf7f524784a14818bf24
+DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
+EBUILD cyrus-imapd-3.0.13-r3.ebuild 6067 BLAKE2B 422166e4f12070388cdb1b78c31bc0b56c219bac745e5a2895aa263d5bd41ccc8d54d264bf52b64607dc5328aa90f01800828e3769cb39e0ad75113eea2fc3c1 SHA512 3bfa669a36b4a579b3a490f2e3ad7925b25156faba1c3bbe0aa5b1c7ec03bb166984bb0db46c0f06df749094371a32e380f1ea150f19b97fd1f4381193d8739a
+EBUILD cyrus-imapd-3.0.14-r3.ebuild 6028 BLAKE2B 463e683e17b24a77e1b43c74acbe9acc82a1a26778864af494e20a9b87974669f16755e0e73551d084052291d511ae8b37accedea4367f23700e5e0bfdb2260b SHA512 a93e938f32adfe3343fc8f48de88fdf7d56fa7143ad7e72a6cd53cf57f51ac4ea944bf111ac23c88b9c3e82308f73e838687dc85bfd502f580abd343cb7b901c
+EBUILD cyrus-imapd-3.0.15-r3.ebuild 6014 BLAKE2B e54aaec2fdd799dff18f88abb21f68249d83f7e8caa3e043088f4ee3e3438b1edf12ea7a47c4e3df59d87739924310720ffbb6dc59d37b73de84d1b48eeec6bd SHA512 807335015a798ee0a25176c028ff4f2d865a48114d953ddfe6fcb4db6f87770b3a36be8f610b65edcb7c36e396892291de5bed5ee6c799715e5b022d7cc16a05
+EBUILD cyrus-imapd-3.0.16-r1.ebuild 6014 BLAKE2B e54aaec2fdd799dff18f88abb21f68249d83f7e8caa3e043088f4ee3e3438b1edf12ea7a47c4e3df59d87739924310720ffbb6dc59d37b73de84d1b48eeec6bd SHA512 807335015a798ee0a25176c028ff4f2d865a48114d953ddfe6fcb4db6f87770b3a36be8f610b65edcb7c36e396892291de5bed5ee6c799715e5b022d7cc16a05
+EBUILD cyrus-imapd-3.0.17.ebuild 6018 BLAKE2B 141a77733d98f59c1481f23b587d1eca06cc825a852cc7f1b7c28b587c2bdab36e0496847cc4a159bede2039b039ef5a54525b0bfad3245369f4c912f3ae31fa SHA512 2a5bd91ce16be19835c1941a15fd984b9d44afba3d9812f52508dad75011dc433d50c5ae409c9aa4abf750bee3c1284383ca28f44c6e51b8710d65cbb79abd5e
+EBUILD cyrus-imapd-3.4.2-r1.ebuild 5961 BLAKE2B f4fdb124979c42684c6b5d9bf3298ec1a98f5506c0d04aabd077f5c15bc4b639507f1a90316b2e482c095a99df4c6e8898bd2ac0f91409d26add6ecefabfa617 SHA512 1d466afee36da3c68f56bb021b16cfb7db75dfa184309c2ac882e62f68c0c10857780ed49437dc350e7a1282937b304d2f57229f1dd8684f6779ffa130cac227
+EBUILD cyrus-imapd-3.4.3-r1.ebuild 6310 BLAKE2B c5749ceb67fd013ab473ea984d5b8491a5edbee1426f9d465a4ecb84f76adb91e5a536ab52537f6c652105940679532b9ff5a4ae3beaaab4f9e0c7144d4087a8 SHA512 418dd8647e1eb88792ee776d3ebed3955ceb776b2c67c5302a5c9e97ed4f58520b0d78aa1c1e9245f8ff31de8067b2d8a346a0b6323cd7e8a9d02eee5d49b237
 MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
index 6b45c1d02cd5..ef409df0114d 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
index 1a96230a857f..b64e165b3a8e 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.14-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
index cdbc51c6944c..661c6333d774 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.15-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
index cdbc51c6944c..661c6333d774 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
 	mysql nntp pam perl postgres replication +server sieve snmp \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
new file mode 100644
index 000000000000..fb391be37dcf
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap lmdb \
+	mysql nntp pam perl postgres replication +server sieve snmp \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	sys-libs/zlib:=
+	dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-fs/e2fsprogs
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		dev-libs/libxml2:2
+		dev-libs/libical:=
+		net-libs/nghttp2
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	lmdb? ( dev-db/lmdb:= )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		sys-libs/pam
+		>=net-mail/mailbase-1
+	)
+	perl? ( dev-lang/perl:= )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( >=net-analyzer/net-snmp-5.2.2-r1:= )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? (
+		>=sys-apps/tcp-wrappers-7.6
+		snmp? ( net-analyzer/net-snmp:=[tcpd=] )
+	)
+	xapian? ( >=dev-libs/xapian-1.4.0:= )
+"
+DEPEND="${CDEPEND}
+	test? ( dev-util/cunit )
+"
+# all blockers really needed?
+# file collision with app-arch/dump - bug #619584
+RDEPEND="${CDEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump
+"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+PATCHES=(
+	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# https://bugs.gentoo.org/604466
+	append-ldflags $(no-as-needed)
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# sphinx is unmaintained and dead, bug #662944
+	econf \
+		--enable-unit-tests \
+		--enable-murder \
+		--enable-idled \
+		--enable-event-notification \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--without-krb \
+		--without-krbdes \
+		--disable-sphinx \
+		--enable-squat \
+		--with-zlib \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with lmdb) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_with snmp) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+	cp -r contrib tools "${D}"/usr/share/doc/${PF}
+	rm -f doc/text/Makefile*
+
+	mv "${D}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
index 3c1ae3f5e26a..5df5b8a089db 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="afs backup calalarm caps clamav http kerberos ldap \
 	mysql nntp pam perl postgres replication +server sieve \
 	sqlite ssl static-libs tcpd test xapian"
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..6f4377b85644
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r1.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Keep an eye on https://www.cyrusimap.org/imap/developer/compiling.html!
+inherit autotools flag-o-matic pam ssl-cert
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="https://www.cyrusimap.org/"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="afs backup calalarm caps clamav http kerberos ldap \
+	mysql nntp pam perl postgres replication +server sieve \
+	sqlite ssl static-libs tcpd test xapian"
+RESTRICT="!test? ( test )"
+
+DEPEND="dev-libs/libpcre:3
+	>=dev-libs/cyrus-sasl-2.1.13:2
+	dev-libs/jansson:=
+	dev-libs/icu:=
+	sys-apps/util-linux
+	sys-fs/e2fsprogs:=
+	sys-libs/zlib:=
+	afs? ( net-fs/openafs )
+	calalarm? ( dev-libs/libical:= )
+	caps? ( sys-libs/libcap )
+	clamav? ( app-antivirus/clamav )
+	http? (
+		app-arch/brotli:=
+		app-arch/zstd:=
+		dev-libs/libxml2
+		dev-libs/libical:=
+		net-libs/nghttp2:=
+		sci-libs/shapelib:=
+	)
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c:= )
+	nntp? ( !net-nntp/leafnode )
+	pam? (
+		>=net-mail/mailbase-1
+		sys-libs/pam
+	)
+	perl? (
+		dev-lang/perl:=
+		virtual/perl-Term-ReadLine
+	)
+	postgres? ( dev-db/postgresql:* )
+	ssl? ( >=dev-libs/openssl-1.0.1e:=[-bindist(-)] )
+	sqlite? ( dev-db/sqlite:3 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	xapian? ( >=dev-libs/xapian-1.4.0:= )"
+# all blockers really needed?
+# file collision with app-arch/dump - bug 619584
+RDEPEND="${DEPEND}
+	acct-group/mail
+	acct-user/cyrus
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/courier-imap
+	!net-mail/uw-imap
+	!app-arch/dump"
+DEPEND+=" test? ( dev-util/cunit )"
+BDEPEND="sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+REQUIRED_USE="afs? ( kerberos )
+	backup? ( sqlite )
+	calalarm? ( http )
+	http? ( sqlite )"
+
+# https://bugs.gentoo.org/678754
+# TODO: check underlinking for other libraries
+#PATCHES=(
+#	"${FILESDIR}/cyrus-imapd-libcap-libs-r1.patch"
+#)
+
+src_prepare() {
+	default
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -i -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			"${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -i -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		man/cyrusmaster.8 || die "sed failed"
+
+	# lock.h to afs/lock.h
+	sed -i -e '/lock.h/s:lock.h:afs/lock.h:' \
+		ptclient/afskrb.c || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# bug #604466
+	append-ldflags $(no-as-needed)
+
+	# Workaround runtime crash
+	# bug #834573
+	append-flags -fno-toplevel-reorder
+
+	if use afs ; then
+		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
+		myconf+=" --with-afs-incdir=/usr/include/afs"
+	fi
+
+	# TODO:
+	# - revisit --with-sphinx-build=no? (it's docs this time, not the search engine)
+	# - post-emerge message re lmdb removal?
+	econf \
+		--enable-murder \
+		--enable-idled \
+		--enable-autocreate \
+		--enable-pcre \
+		--with-com_err \
+		--with-cyrus-user=cyrus \
+		--with-sasl \
+		--with-sphinx-build=no \
+		--without-krb \
+		--without-krbdes \
+		--enable-squat \
+		--with-zlib \
+		--without-wslay \
+		--without-chardet \
+		--without-cld2 \
+		--disable-srs \
+		$(use_enable afs) \
+		$(use_enable afs krb5afspts) \
+		$(use_enable backup) \
+		$(use_enable calalarm calalarmd) \
+		$(use_with caps libcap) \
+		$(use_with clamav) \
+		$(use_enable nntp) \
+		$(use_enable http) \
+		$(use_with http nghttp2) \
+		$(use_enable replication) \
+		$(use_enable kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with perl) \
+		$(use_with sqlite) \
+		$(use_with ssl openssl) \
+		$(use_enable server) \
+		$(use_enable sieve) \
+		$(use_enable static-libs static) \
+		$(use_with tcpd libwrap) \
+		$(use_enable xapian) \
+		$(use_enable test unit-tests) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALLDIRS=vendor install
+
+	dodoc README*
+	dodoc -r doc
+
+	cp -r contrib tools "${ED}"/usr/share/doc/${PF} || die
+	rm -f doc/text/Makefile* || die
+
+	mv "${ED}"/usr/libexec/{master,cyrusmaster} || die
+
+	insinto /etc
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf cyrus.conf
+	newins "${ED}"/usr/share/doc/${PF}/doc/examples/imapd_conf/normal.conf imapd.conf
+
+	sed -i -e '/^configdirectory/s|/var/.*|/var/imap|' \
+		-e '/^partition-default/s|/var/.*|/var/spool/imap|' \
+		-e '/^sievedir/s|/var/.*|/var/imap/sieve|' \
+		"${ED}"/etc/imapd.conf || die
+
+	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
+		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
+		"${ED}"/etc/cyrus.conf || die
+
+	# turn off sieve if not installed
+	if ! use sieve; then
+		sed -i -e "/sieve/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	# same thing for http(s) as well
+	if ! use http; then
+		sed -i -e "/http/s/^/#/" "${ED}"/etc/cyrus.conf || die
+	fi
+
+	newinitd "${FILESDIR}"/cyrus.rc8 cyrus
+	newconfd "${FILESDIR}"/cyrus.confd cyrus
+	newpamd "${FILESDIR}"/cyrus.pam-include sieve
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; then
+		elog "For correct logging add the following to /etc/syslog.conf:"
+		elog "    local6.*         /var/log/imapd.log"
+		elog "    auth.debug       /var/log/auth.log"
+		echo
+
+		elog "You have to add user cyrus to the sasldb2. Do this with:"
+		elog "    saslpasswd2 cyrus"
+	fi
+}
+
+pkg_postinst() {
+	# do not install server.{key,pem) if they exist
+	if use ssl ; then
+		if [[ ! -f "${ROOT}"/etc/ssl/cyrus/server.key ]]; then
+			install_cert /etc/ssl/cyrus/server
+			chown cyrus:mail "${ROOT}"/etc/ssl/cyrus/server.{key,pem}
+		fi
+	fi
+
+	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
+	einfo "for upgrade instructions."
+}
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 9c4ab2478cb7..bd9bfde15790 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -3,19 +3,12 @@ AUX dovecot-autoconf-lua-version.patch 538 BLAKE2B 3978ebff83cb42591f60fc1cc155b
 AUX dovecot-socket-name-too-long.patch 356 BLAKE2B ada5007b620cd5eef5a950d64add7d83ac366f126e1a9a70268e528d44a0a036fec096015bee2421caeca8a052d118011c5911b3c432fa73e846c66781df4da9 SHA512 f362bad725c9e408830dc9d5908a2b35b8ee82cb05f3d58795079b32d5ac4712779e71bd0f479fe072906fcaf01e4e08f08cedb9fd5ee08931409887480b8349
 AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063
 DIST dovecot-2.3-pigeonhole-0.5.14.tar.gz 1910607 BLAKE2B 5c08214535d298ce2b8defd8c945e96597a98bda6493a3e27481fdadc0e149e6dd01c6ececaa583dd331614669bd8e033cd1b91d64d03a9e0cdcef67fa9c27b8 SHA512 c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc
-DIST dovecot-2.3-pigeonhole-0.5.15.tar.gz 1935601 BLAKE2B e26405cc9a93681206e27c2b548e3409ae4444c1c011127b27eda364fec27d572dc01c7ea63688693bde10a8b4086bf67e14bb67e917d62db426d8871d6af0ec SHA512 521070080802bf2a50cd0ff0af5dc991c04d70b807abc2cd9aa567444a4869f5f42800f19d9b740a519bd4069437139e70ca6ae4b905479fcec8faa133ac5f54
-DIST dovecot-2.3-pigeonhole-0.5.16.tar.gz 1944573 BLAKE2B a859c396126132669793c73c695380f24f1ca205b8153cb5f60f3be37194c48ae7d0dd6a7bd37fafdd9e95dbcdc2ab341146883013c63c1b5ccb5a9bb4b7b9ae SHA512 880e00654eab85cc41b27ac470cce6011991e3cdb005642f495c2297fd9492bfb2b6b4ef63c88c2ac10bec870ad69b8bee6b11dd1bc5099e16c3cc2857312543
 DIST dovecot-2.3-pigeonhole-0.5.17.1.tar.gz 1952704 BLAKE2B 7dfc6b5bdb82bcaa60e0f41722f9a884edee7853ce09c9391d4c610be16728f58cc7095b8dd2d47e89296ff36aa926c687b39a418bc74ca0bfc3c4eab98156df SHA512 632a963d90a3fa052f314360d59ff25274d80952307ab5dd9193a2713ebf686500a7b2559b56f04b07e0a261066eed9b8525b14197f3be51728af09acb76e894
-DIST dovecot-2.3-pigeonhole-0.5.17.tar.gz 1951089 BLAKE2B fb91e668cf56632b749fed6e9c620b591bee82b19e928dd4cd3dca657dff6938ba4ae4776713a98b0ae38c17e3d6a613b35971cdbae792e18d4563f5f7efaaff SHA512 c4bf69504ec22de53bfeffb55fc95438fb0f648390ca6e6485f652e2e74a34cd7508390bb595b958cbabc53f0e20fbc42e163b2682dc65159fae2acafbd94bad
+DIST dovecot-2.3-pigeonhole-0.5.18.tar.gz 1953892 BLAKE2B 478da07a2f507a3322c6b6035f8cb74a720c030cc9413496f90a793d165178617207e26b0b57f710a9b9c7671be3fffdbaccaacb8747198abf82943dcb4a24df SHA512 44c3d945a5aebb8935e6e46751e44f505f2abd529c31e3efb689d3b5b9cdf9bca4f5231fc42a8d19837cb95c7618f5b64dfdf5964f40a0a6987144a37cdbaaec
 DIST dovecot-2.3.14.1.tar.gz 7534719 BLAKE2B 1ba5143711fe340b9fad61db41ba658485e42be52f3b0f196eeb9b8e4b7c1b865b6a08f879dadeb2db3979b17be34699ce5febc4545887307f62bd5b72076f86 SHA512 b71b82c2918ac9940ef6bc274bc9c2b3e56a08cf5054244d80547ad89c421b9180c5afa8b5b140831239fbe2cbeeceb83a0052e037eb198d8fc27d07cba4ba35
-DIST dovecot-2.3.15.tar.gz 7608561 BLAKE2B 85134064dbff0b4f50831a835fb6eafc92081d75d91ab331fa0ae79c453382a88485bad8c774491968b879478dc66841a9c6170e5931d562cf5eaa6af755440b SHA512 75bbdbeac663da109f78dba06c42bb5193e911c6b3c64f055fc4473ae9afaf0c8304c49fc7f06c5c6b61e67dd13dc21fbed6ff160a99f38f547c88ba05e6b03a
-DIST dovecot-2.3.16.tar.gz 7650008 BLAKE2B 682067330e94a51a6bc6c82444a5e29a08d6382652a531597bd8c3eecf0bd86f6d4d1bc20e0467c36d5285e9df5ba25aee7dd6db727d195f8f67ac403becfcf0 SHA512 31a9d352c7ead466d65ee0535b1fbd9138e35235f1ebfeedc4eef54cba450663c59708d162eaf0712af1c40f23526ac86aab2eece8cefde3edf690127472fd1e
 DIST dovecot-2.3.17.1.tar.gz 7700848 BLAKE2B adf12c84def899795d8446766b5c88fd5c68a5969a1807b4dd9c2e4894ddc0693a771ce4d4c0c72b0b03501903c39c650eace97b6708114b7fe038b62ea2ecce SHA512 976aa4f68e86f401e5766017e1702740d5b03892aff98f31f9ef0c6d242311d0f4b50d7faa426306bf1c902d7fc6d021438977bc887fa66ee360b069ec32ad79
-DIST dovecot-2.3.17.tar.gz 7699294 BLAKE2B 1dd044abc9cf27aa8ced5595d875a2b08abba93b43727db6ab1508ae4a841cada57a53d76bf318f497b61f0dbefad66091e652e4b73a4b25d37a763e31a2241b SHA512 5b45d0f2f8af5cf095aff35f8e6a74bbbfd153b6e4596510eade671507d77476544e3a012087b4d4432c0399601f29a49cdf8b34249438f440031c8d027d1cd3
+DIST dovecot-2.3.18.tar.gz 7763230 BLAKE2B ff3e0c2cad87d2e2632345a25825eebd0a6c1520376d85286453bde7505f22410d03911cd588a0d102b75f22cc1de051b01c43a57c90138340186e8cb024247a SHA512 b5eccf790a3960614876f122efb6296fe49ab7c523b08c10347fd4d10ed293fbd327279511c227b420f7c0786975186157eaa0fb5cd3aab1f3be9a4c5c3ad233
 EBUILD dovecot-2.3.14.1-r1.ebuild 8699 BLAKE2B 025b31d9339716d42205d8ba732895affc49f3ca967b2f5fe07f908e0af64a06da4da2e2c06f269b4994a784007743c2ff8a0cac4aa73c223bd9b3f1dc6f9635 SHA512 52cecfeb9b0a6c7cf422ad4ee30dba6bee0e6b813ba43514bc62d899763a470c71b50c83e063867e8bd5b4a0010b8a29d5dbeaebcb9b51d8d74864d5483de89c
-EBUILD dovecot-2.3.15-r1.ebuild 8858 BLAKE2B 15b3b8ea8586f1bf5cee1e6ad7b262f7816ef0b251464aeba84b30653f4b8cea91ff121ba620cc93026d9a7b056e6a4519f5b76f4482443d008d88e1c4033b78 SHA512 cb4dce94e90ae5845981a625767a2f5625d85cf57c47ee19c07b46297a8cf1b6d37b3182ee0a804eea25c4520c6902311f322d4ff81f9858ff3bcca080e5cff7
-EBUILD dovecot-2.3.16-r1.ebuild 8862 BLAKE2B aa62494061ac369981982cea2c43c9e0f18ba5d98bab0b21bb83a43a99035caa9e998c1ec929724ed8e10f74ab33e636f22ffcef733f112b227a40a3544db7a6 SHA512 1da9964f1effed2f2423cb27b929ee9ae715807364d6ce2c8a9d45dad7f7b5d21389b2d132b9879aff1b077a821de20ea242fdfc295ed9f00f8a4d1ff23d4a97
-EBUILD dovecot-2.3.16.ebuild 8882 BLAKE2B 76a6c3bebab81278a54c733e35e33b9b8ddb8cd61c9999ca3f0c59b195d3aadcc84ded551ae30cac1ea0a173b9f240b8a18b97e05898bc9b690f94fee0e16880 SHA512 c89b7b723b14d42d203acc8fe8331b00f0b696792a93a162184e309a034cef5b89765507e0a20d133508b70c8dacc1ec19f3c68c92eea78145c29a8725f1b045
 EBUILD dovecot-2.3.17.1.ebuild 8864 BLAKE2B 5b0ff4c44eed53cefb3fed6b359780591642f08899cd60282c857d43ecfaaba6e24c99bb325634c71571ea6ac79dbc2f5a78b036f6de3c77b8d650ccb1986ec6 SHA512 ae19bc3a26950d52add8786efdb36594e240d75914d0df275690255015781ccd34179b0ddddd7dbd564995240744a966f17394511692b0689fe60f6068ea1d2d
-EBUILD dovecot-2.3.17.ebuild 8862 BLAKE2B 9474282e1c8e8d9155d0f2ecf61dfffee6284f4ae7555162704a141f87f27361e8b7690e727b527cc5cbf644c755ec9e3da55955891148a84443d8a418720ded SHA512 d02d4dc1c03afe610075bedcbba97d3c4558226b67be95750330b85f51870fedd9ed06ebe6892a87330da61d907b960c87294ddbd0dc7f81da9c394f498eed0e
+EBUILD dovecot-2.3.18.ebuild 8860 BLAKE2B d651e83be22077f5db95bebd907350d982cfaa238443b19444a9d43465df74893906014fba00acbb82e403bfbd64d0cf83739a1c158b3a1a59844589064b84de SHA512 0fa6caafa3b0791fd6edcaa5dd67bd9e369b042cf16aec3174fcf1aee9a25fe2ae8cbeb6c54e93b70c6f661cd735e157d687193f6465a768cfc76a68b79c76dc
 MISC metadata.xml 1091 BLAKE2B 5852eefa5b3be607a1e7d1bd5e8aa8ce2317db6ccc8c915438ab1aef54d59d2bd6953b1015c429a391c4b7cf69bdb562da80bfd66451dc40f21cc5d6adc28c10 SHA512 9eb91f5290af634e94abd0d1542c88c69da77f892bb15cc5a90d461cd456df5c68f4c9b783a63705297e88291c7d9d917a9adcfb55a32fbc04da82ae0528dad3
diff --git a/net-mail/dovecot/dovecot-2.3.15-r1.ebuild b/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
deleted file mode 100644
index 1668061de0a9..000000000000
--- a/net-mail/dovecot/dovecot-2.3.15-r1.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic 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.15"
-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 ~riscv ~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 lucene managesieve rpc
-	selinux sieve solr static-libs suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/icu:=
-	dev-libs/openssl:0=
-	virtual/libiconv
-	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 )
-	lz4? ( app-arch/lz4 )
-	lzma? ( app-arch/xz-utils )
-	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:* )
-	suid? ( acct-group/mail )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	"
-
-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-v2.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
-
-	# Bug #727244
-	append-cflags -fasynchronous-unwind-tables
-}
-
-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}" \
-	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-	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 \
-		$( 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 systemd ) \
-		$( 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/dovecot/dovecot-2.3.16.ebuild b/net-mail/dovecot/dovecot-2.3.16.ebuild
deleted file mode 100644
index 63ecb73f66d2..000000000000
--- a/net-mail/dovecot/dovecot-2.3.16.ebuild
+++ /dev/null
@@ -1,306 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic 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.16"
-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 ~riscv ~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 lucene managesieve rpc
-	selinux sieve solr static-libs suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	dev-libs/icu:=
-	dev-libs/openssl:0=
-	virtual/libiconv
-	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 )
-	lz4? ( app-arch/lz4 )
-	lzma? ( app-arch/xz-utils )
-	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:* )
-	suid? ( acct-group/mail )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	"
-
-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-v2.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
-
-	# Bug #727244
-	append-cflags -fasynchronous-unwind-tables
-}
-
-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}" \
-	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-	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 \
-		$( 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 systemd ) \
-		$( 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 ldap ) \
-			$( 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/dovecot/dovecot-2.3.17.ebuild b/net-mail/dovecot/dovecot-2.3.17.ebuild
deleted file mode 100644
index ba8648611522..000000000000
--- a/net-mail/dovecot/dovecot-2.3.17.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic 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.17"
-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 ~riscv ~s390 ~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 lucene managesieve rpc
-	selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/icu:=
-	dev-libs/openssl:0=
-	sys-libs/zlib:=
-	virtual/libiconv
-	argon2? ( dev-libs/libsodium:= )
-	caps? ( sys-libs/libcap )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap )
-	lua? ( ${LUA_DEPS} )
-	lucene? ( >=dev-cpp/clucene-2.3 )
-	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:* )
-	stemmer? ( dev-libs/snowball-stemmer:= )
-	suid? ( acct-group/mail )
-	systemd? ( sys-apps/systemd:= )
-	tcpd? ( sys-apps/tcp-wrappers )
-	textcat? ( app-text/libexttextcat )
-	unwind? ( sys-libs/libunwind:= )
-	zstd? ( app-arch/zstd:= )
-	virtual/libcrypt:=
-	"
-
-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-v2.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
-
-	# Bug #727244
-	append-cflags -fasynchronous-unwind-tables
-}
-
-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}" \
-	systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-	econf \
-		--with-rundir="${EPREFIX}/run/dovecot" \
-		--with-statedir="${EPREFIX}/var/lib/dovecot" \
-		--with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-		--disable-rpath \
-		--with-bzlib \
-		--without-libbsd \
-		--with-lzma \
-		--with-icu \
-		--with-ssl \
-		--with-zlib \
-		$( use_with argon2 sodium ) \
-		$( use_with caps libcap ) \
-		$( use_with kerberos gssapi ) \
-		$( use_with lua ) \
-		$( use_with ldap ) \
-		$( use_with lucene ) \
-		$( use_with lz4 ) \
-		$( use_with mysql ) \
-		$( use_with pam ) \
-		$( use_with postgres pgsql ) \
-		$( use_with sqlite ) \
-		$( use_with solr ) \
-		$( use_with stemmer ) \
-		$( use_with systemd ) \
-		$( use_with tcpd libwrap ) \
-		$( use_with textcat ) \
-		$( use_with unwind libunwind ) \
-		$( 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 ldap ) \
-			$( 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/dovecot/dovecot-2.3.16-r1.ebuild b/net-mail/dovecot/dovecot-2.3.18.ebuild
index e247acb3400a..8754894a3018 100644
--- a/net-mail/dovecot/dovecot-2.3.16-r1.ebuild
+++ b/net-mail/dovecot/dovecot-2.3.18.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ inherit autotools flag-o-matic 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.16"
+sieve_version="0.5.18"
 if [[ ${PV} == *_rc* ]]; then
 	rc_dir="rc/"
 else
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.dovecot.org/"
 
 SLOT="0"
 LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
 IUSE_DOVECOT_COMPRESS="lz4 zstd"
diff --git a/net-mail/eps/Manifest b/net-mail/eps/Manifest
index d1f8a59ce78f..95a45700111e 100644
--- a/net-mail/eps/Manifest
+++ b/net-mail/eps/Manifest
@@ -1,4 +1,4 @@
 AUX eps-1.7-static-libs.patch 346 BLAKE2B 79173cb773a3e6a6b2ce1e299f57e2a3022ac84a5fb6179ab41c1fc47876df57048ce5332917ef8f639917a00e4b284ea56b983fe23f8037287495265b3e3503 SHA512 83704853338dd5f267e18023ef88fc5dda610fca73caa6ef9e7fb67ca1e30200fd923212381ca0b85a2f2b41322612b68d1562afaa19da82ccc9fa38ce77e7dd
 DIST eps-1.7.tar.gz 29913 BLAKE2B 83205ed03cd4d28538c356b3d905437179c961e8a3d60059a59cd32b16548a4cb9bd73382bd4a948fe4a985a5cc39a85ec84126df1a61799a6dcba3a6227ff66 SHA512 be7df0d5bce5798afda0573b5d943da7e69e6b99817f4ed6d87e2858e75d7c2408d7fa9942dfc6277db0bedb73cf1f5ca64542d070075dda544cbc695134b1a0
-EBUILD eps-1.7-r1.ebuild 814 BLAKE2B 0c2de3b48c275b5954da416e5659d9c74c3a68a0a20d8d487a628bf5ef4ec6a128bbc3270c9bf7fe10af118573f6874ecb2753b112d714e33f8895dc35ac6cd7 SHA512 d8e7992cb75e70bf2faaf8c452c7ef7f6662c7dd604352c1a302adb51ef7ed8e61644c428650a0d3b3e4a7d763109eeb120f714236a18267ae4af8c06057317d
+EBUILD eps-1.7-r1.ebuild 815 BLAKE2B 2134cb4984ef1161b866ace1e482f7add25deef11d4704b9107731e01eb786f0edcbd9050c9917d882e2f3adc7a57bd1f31298f3e4c6e7b95024e507c25b92ab SHA512 27f6008748d03a5d5654d09fdb02085de7144f8c2ada7c91058af2a34b14086cc10ffe9e5356f59798763b5700b9ca0c25a08f7634d595dcc68dafd6eacc0e40
 MISC metadata.xml 448 BLAKE2B dd6818604f7879909b842b31889b8575f85851c0055a9b587c2675f8b8b606ecd4b5389ee781ffd53de24743e1f454072cc7986673f3e517fa6f7abe88184692 SHA512 8a434126b44d3a4b19790d50787586bb919a6359044614db8b35994a46d5add0d0b78342eb93043acf00c982786241076dd7ff68be9578f23f56acb5701cf9b1
diff --git a/net-mail/eps/eps-1.7-r1.ebuild b/net-mail/eps/eps-1.7-r1.ebuild
index 40d368deccd5..a71fba82af0c 100644
--- a/net-mail/eps/eps-1.7-r1.ebuild
+++ b/net-mail/eps/eps-1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.inter7.com/eps/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 PATCHES=( "${FILESDIR}"/${P}-static-libs.patch )
 
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index 7105210015f2..494dd873abd1 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -10,6 +10,6 @@ DIST fetchmail-6.4.27.tar.xz 1326668 BLAKE2B fb349f8e4b17929d8ab5ec144e2d6e4227b
 DIST fetchmail-7.0.0-alpha9.tar.xz 1213244 BLAKE2B 895fe178993cc34500e276bef5ebe9a4fd81fea522d39fd271433320afc46faa9657d8b85b2d28cd5dbc6d3dbbb233d5eb27d3e26205f5406de9f750c50d7f1b SHA512 7ac1c26edfd2a0d69ba3c1e9f47d96aa48f1cdc10060ff928f952e43141651896f5c5190c41064075fb5c5837516f63d6ff3e7fb0cdc7d389c44b6e39db01d8f
 EBUILD fetchmail-6.4.21-r1.ebuild 2404 BLAKE2B 0526de2e2c4b499d00c87cf303b69bf92831ef57508c1736f0778b10d95f801e7ed2a53755e481ae5457ca081e3fe8feaa97ecbc7aedcdabf093ea7b9082d19f SHA512 a6311cf3cdf4b349ecced75080bac3f6929efec60d69b17474ca2638c0f9f1ccfaa87d970bcb3058768ef17e5bf96912e2b90be5cd8745c81974c2c49ff5e961
 EBUILD fetchmail-6.4.22.ebuild 2410 BLAKE2B 6cc76486f6785669f7f33b6253f0f6f0806e52b92d620be4937fbc59bbbd2f5089d8df3a5be15fe90190bc93190e72e80ad4014455df2be25f3d74ab1363ca77 SHA512 ec65e9036f5ba09e2b85cafeaefcd5fbdc7bb677d39812629fced391a1216688035acf78ce13af75dc193974662f8f53fa29d9ffb3b353720a725fec902e099d
-EBUILD fetchmail-6.4.27.ebuild 2412 BLAKE2B a2644e37ed48a91d36ec5a1c78745a65927e0b05b370bc9711f219ced2dae8ec33e8da4139d3d9def9a3e4d2fbcc4fe689eaabd237823266fdf8ab0d86b5d357 SHA512 2e24460b86d3bb8686a4d2bb79afb79b7b3c552cbca5039309561a744e271af796e1c020e2ca4983d1cff65cd38f16e0210a152b47255362419ce00a58dd5a68
-EBUILD fetchmail-7.0.0_alpha9-r1.ebuild 2524 BLAKE2B e0860a0bac968a4c329886ea0a87202e4fc456d7e18962226aae9b4f8ad908ae912f0dfa236de6cce96e00d1cbf5d7d49f1f75405c496eb47c5c7f1d32e266bf SHA512 97b684257c686861f8420b2f576f1d9bf55d04ba5f48544fcd36b85b0fa9f5becc6239e78d6237e33002c337a13c644ad216a71a5407138814fedf4a55be8423
+EBUILD fetchmail-6.4.27.ebuild 2419 BLAKE2B fcedadeae6c40f592d804d35d785afcc96a56240e457becef83514d0a70eac06fa53a692fc013b9ef4ebd4fb4bdc3b9e8641f97e033393863b745fe8405e3fb5 SHA512 e2cafac3c823a71b4029abe839d34ecf7a92c4e257a8a05e5a34b96fbb63ea65f84a970397272e1461a08ab385e15d1ab98891c29fdad632660db526eec24ce2
+EBUILD fetchmail-7.0.0_alpha9-r1.ebuild 2531 BLAKE2B 9dc659ea3187b6d7bf5c48f85201c3c844b491fe82f7f4f396afad2057d28b4dbaf2ad3e3569d1563b81dd660bb8cf3fffd4da4e225dfd66a613551972191998 SHA512 385e30678b4fc99c3886d1a5e1f0e346858f32435a72d0d9a1939a6e2a93a3c7cb121e4af0ce9fa80add6fd23ef362c26f06b40073de0130f1e460fb12a1eaa5
 MISC metadata.xml 522 BLAKE2B 34e08c52e9391d8f01d717516857cde4c2c77af269d587a29ce6d6e3c6c2e989898f5afcb1240f6718dbdb18be2700b66980f5a684c253c69ed4123e6bb6905e SHA512 8c6fd6c541834669a9518b31859990c8d6e9946e35bc1aa00bf2e0c1822392508ff712119005b97f5e85ca74e97c0d5cf3ced5798a388c23f9c8fd959feaf8cc
diff --git a/net-mail/fetchmail/fetchmail-6.4.27.ebuild b/net-mail/fetchmail/fetchmail-6.4.27.ebuild
index 6ade24bb6f82..98b1ae2dae89 100644
--- a/net-mail/fetchmail/fetchmail-6.4.27.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.27.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="ssl nls kerberos tk socks"
 REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
index 183128624bae..c0b4ff885c7c 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="kerberos nls +python socks +ssl tk"
 REQUIRED_USE="tk? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest
index b33eca3f4f4e..7ad31365a7ae 100644
--- a/net-mail/isync/Manifest
+++ b/net-mail/isync/Manifest
@@ -1,6 +1,4 @@
-DIST isync-1.3.6.tar.gz 317174 BLAKE2B 3a230cd4bfac061ceb3325732c336ccd808a662989d2fc81459b4b27fce927a62e335200ef233f63d28b80f6ba79b1e5e102fda8ec68c9cd8e368f8ddd7188a0 SHA512 16e859361b27f00e1ef9eda0a2d06edf271b2643107a1f90c90713c34ffe9b542cdedb31218db72db633e12cf39a6aa2ac509333647c79a1825faac8ad4ead38
 DIST isync-1.4.4.tar.gz 340544 BLAKE2B fdf38b1066af10315b780897f1fe09c8f7d0b4d2202383a5f0ef24b98f11dff625bf178bbb0dc846460f661b18f923d2823bf79643d4d376b606b03980f22e18 SHA512 b769f474f2296764cabaae7e2b23e47c22714fca5919e9f1c916ed70b18c71c0bc9301fff0f64434f4f0ae28c9d16216e72556b48014ec94d1b7646de7183011
-EBUILD isync-1.3.6.ebuild 801 BLAKE2B 4dc5a77de4e8881037e55cf850f5688794af7e2de5c8079dcb8837430ba01d19f92b7748204389490afb2976a0aa9d53c51a6aabaddd6d4ce017c7286446e39e SHA512 799eff4c0ee5d7318c120db1fee2646a2a8b29988b063d0255d8393aab346c5f34d093a8067adb446c51940c6ba557f3df213019355fa0017a720d54d860142e
-EBUILD isync-1.4.4.ebuild 857 BLAKE2B 7b1e20661b45e8aa1accd4d9e7110bd460d61ac7d94ca4632bdd060beb32b4dc1130988fb27227576b749336443abe57a257af83e0f5f4049dfa85e7456d8147 SHA512 a133014d6c37fb17d8a0922858265d42da20a0c6fc7f3a3e5c383ff9ee4a35683e227ef795e1955393b41a190f9c395bcc6ae8fe1e375b084546014f36a96dca
-EBUILD isync-9999.ebuild 861 BLAKE2B e8f9e580c8415821bb30226910251a8d5c5cb30cb28cd16a0be64bbdbd0534150c67cd26660c2a7c8309c74fb06c4d269190fb72e74d4ef0643b4df139eebe35 SHA512 a3e9b73b53b2ac56dda4784a7bade077189d23ebea58bc3a216825e8ca57bc759c7effeb322800dfdc696d47e274c95143d03bcecbf91c8f352b393b26b06195
+EBUILD isync-1.4.4.ebuild 864 BLAKE2B 93f8cf4c04fa1751f8635b4b83752c09e7c5cfc83ff0a424e96b5075cb9f6a24ded98940453bab236322636c2b336798ddaeaeb32f026f7e514e3aa0c6201c76 SHA512 9e3936a502de77ed404f4d40422d670718ab5e21ddaba5b0d0c2f6613b1b613888ab47177ea8e80fe70e6cd07c253592befdc343dd0acf23528588688b839ea2
+EBUILD isync-9999.ebuild 868 BLAKE2B 5e5118b61f13a89574fbbc7372692695d3336222fc5736ee21eb203ae95e4dda229800a3d572abe704b151f0ec8d51ff36e23c3e2f666427f9a48777a1004d7c SHA512 d5718b3b271f51e6a6a02eec7bca79ac136ce67eec48e9e976e81c57bfd33d940aa3375c23cda0d0920e527a8e5e2e65a9abba9240f60d28c9685f3cf6332b4c
 MISC metadata.xml 377 BLAKE2B bf6ebe92478a45a3e364cdbf971f339468b87cb07f5206aa0db1e00d03bd1bfb920f1df1be8547d8d668e474de38d29ff9902e0411b816e7c7b190ba66bcb90f SHA512 030ed2e882dcc1b89eb2ecc330964636e9dc6fee7c90e64a34ffc0046f0b11a2df51d74d5869ee4728f0b6d41abe016983ce16aed6928a6a917a88fc9d68a407
diff --git a/net-mail/isync/isync-1.3.6.ebuild b/net-mail/isync/isync-1.3.6.ebuild
deleted file mode 100644
index 4f5fbf97af86..000000000000
--- a/net-mail/isync/isync-1.3.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="MailDir mailbox synchronizer"
-HOMEPAGE="http://isync.sourceforge.net/"
-LICENSE="GPL-2"
-SLOT="0"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-fi
-
-IUSE="sasl ssl zlib"
-
-RDEPEND="
-	>=sys-libs/db-4.2:=
-	sasl?	( dev-libs/cyrus-sasl )
-	ssl?	( >=dev-libs/openssl-0.9.6:0= )
-	zlib?	( sys-libs/zlib:0= )
-"
-DEPEND=${RDEPEND}
-BDEPEND="
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with ssl) \
-		$(use_with sasl) \
-		$(use_with zlib)
-}
diff --git a/net-mail/isync/isync-1.4.4.ebuild b/net-mail/isync/isync-1.4.4.ebuild
index 8b349d1935a9..1aa6d569264a 100644
--- a/net-mail/isync/isync-1.4.4.ebuild
+++ b/net-mail/isync/isync-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 IUSE="berkdb sasl ssl zlib"
diff --git a/net-mail/isync/isync-9999.ebuild b/net-mail/isync/isync-9999.ebuild
index 07b35974fe65..e005efe792e4 100644
--- a/net-mail/isync/isync-9999.ebuild
+++ b/net-mail/isync/isync-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3 autotools
 else
 	SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 IUSE="berkdb sasl ssl zlib"
diff --git a/net-mail/lbdb/Manifest b/net-mail/lbdb/Manifest
index 2aaf126459cf..d7c4b2f70ebc 100644
--- a/net-mail/lbdb/Manifest
+++ b/net-mail/lbdb/Manifest
@@ -1,3 +1,3 @@
 DIST lbdb_0.47.tar.gz 182477 BLAKE2B 9ac0073ea4151ae84f9aeafb1a6bde52a39809987da87bd252665f9ef729ad1a5ee4cf91e4c1ebec1f8be17e1a9a3e31dbfda5484ae114fc99cd273f93b39cf9 SHA512 95cae9b108d875203dce2a8243c3dcb979606529202fd9b4d1ddd211a3d617a421440f6532abd38432607b39da84a6da4d09b15e95cddc01f94e018b9e712078
-EBUILD lbdb-0.47.ebuild 1483 BLAKE2B befc891f045d6e9006af750ac91cc34b72bcb4f2d43acf5f2649e342a617244e1e9347107870e7bc68449aea3b36a54df6de4ec0258ba55cefa4f7c2c2bfd7ff SHA512 5d31c52eef6ddefd468bbc7bd11d0df522c5c083af325909c89448b4e200c0b8f5d1729e5ea9a7012f44ded3a34d196c7d462d72b47c0edc4bbded70dc99c402
+EBUILD lbdb-0.47.ebuild 1484 BLAKE2B 84cd877d944dc365495f1a832d5e62ae63aedd558016f36cf754a98468417408d611f6fc2ea9d9100924b442a6fba3c4ff60193e18e658b1f75ba5f2fdbd7707 SHA512 2980de1ccb9f1404f780100ac50e7830a84ad5c9a2f3ec7aecf333da3709bc22bac56309aa2ef82805c8cc16a4cb6b7ad4fd11771e2ef6e442eee73494c9d8dc
 MISC metadata.xml 453 BLAKE2B cece3039d7fd52aed9a44f07f83b825456d610cdf7f1fb76cbb160cecb822086bfaae6b79bf70d15a95b495bfb97d155cc54a0e0fdd276eb6971ab6bc16a92d4 SHA512 686a9e0ede22eeff8de86b0e2a77c3822dd0d310ba8c55f5c9b517c067b81246f9c4d0750408f55e5be8e8dd022f58b9daed3d9b12f1988c90d40342cd49779b
diff --git a/net-mail/lbdb/lbdb-0.47.ebuild b/net-mail/lbdb/lbdb-0.47.ebuild
index af873aceae50..28990f5d8ace 100644
--- a/net-mail/lbdb/lbdb-0.47.ebuild
+++ b/net-mail/lbdb/lbdb-0.47.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.spinnaker.de/lbdb/"
 SRC_URI="https://www.spinnaker.de/lbdb/download/${MY_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 LICENSE="GPL-2"
 IUSE="abook bbdb crypt evo finger ldap pda test"
 RESTRICT="!test? ( test )"
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index 79176a104e9e..bc5180b3266f 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -5,7 +5,7 @@ AUX mailcap-r1 997 BLAKE2B 1e5dc595de7deb3ac0a5dd688de86f93dd9f0e954da705ece4391
 AUX mailcap-r2 1837 BLAKE2B ad868b4ba6b6cbf8dcc7be7b39d763cb7cdd37bd8453f2debda9ab2241f79074e2ffc4112b120027a07ed8c55e1e761b2ecb36436bf380996ea315cc611371c9 SHA512 4360ef0f1d25b6ffb616a957ee81a2b5e0f559dc2ed8a6e221d1122f4a447c90aca2ee83ca0dd4ce5a73b41493ff8cbbe710824c5b6808269d577904b8ab3e2c
 AUX mailcap-r3 1584 BLAKE2B eac2e35ea578079c4a67f71a690443d616f99d666dad12553ae2020fc0affcbc121529c62d9cad1419e42b5a9d95ec3166c3f71385b047827c97acc0cc81d460 SHA512 3be98f171d9b6d891a24cc759d595eb856e28bbe29a2578d409993a6dec33ffd369f1c40bdb143e3e0a3698d009b06d5a0a5d329563c886fc592d58d874eab35
 AUX mailcap.5 8951 BLAKE2B 6bd704c8efe861471343e318734abed30c5f406a06646877286d91bfe3cb9afaf128ddf77675d4a14dd1e19a6979772cf013923cf30b02f62e54eac2a7fe02b7 SHA512 6973397bdd389e8eaf1977d8eeee271beda2ad1bd0b01ed7408156af0e7cf430a45e2b7261213a3278fbc2cbb250b65a3f34c11d3c5603cffffade4f1fba24e5
-EBUILD mailbase-1.6-r1.ebuild 1059 BLAKE2B 8174de2a008b54e42045ffbabecb283875125f271748bc9e6c160a892cac4f09d421cc849d75a9a342057a52d45a02fcc29d697dfca5c0952a24eeb5b1ddf14e SHA512 0e0dc53abddd1b8b62237c17586a69ecb146b082348a5eca795e8ae70763558526cf4ad471166b725c99d7630629c357fe973b3ea1aab8fd05423a8cc56213f5
-EBUILD mailbase-1.7.ebuild 1059 BLAKE2B c963beb8507184a99f701c99c315071991a9560ce604af77eb147ac93cf399dfff013d6247ee80387016a615174b5bf039f24bd07d34cfdcc37068af225ef5a6 SHA512 a629e0333d6fdba2fc5add0bb690f00eeff8f776ac9f780b82ee05602bc049746472e77355b6939746a09e0c620be790f97021fe3acc80f8e1d0b9f799c3fe46
-EBUILD mailbase-1.8.ebuild 1010 BLAKE2B e429ee6de1eb2357d4a2d426890a38959f798a72045e3c17010dba48ff3932d7d23b398192c81ff92e4b28d3c205a637ad6b752e67c16a24cfc88bfe605a0e8e SHA512 afa1c8f727cb5dba7c999abd77a34e29b09fd7dfe6985569f31df25c3ccb9d4b0239290b83a81cc07979b42816881eb3b5a06625f920942c68cf4c574a550dfa
+EBUILD mailbase-1.6-r1.ebuild 1045 BLAKE2B 9363d11476b65fc5dc97420c0046d309756e52fc60cfe7a6c959a0fc40bcc262b666d2389fe1be81d75d721c61046aa5aeefb3784c0715c6a09bcaeb7650880f SHA512 fb737ebc602ad122c66b16f8b3f599d5378f08c7434f0cbb6dde31e16e45129a224c70d9d73e7825a59637c4e3ffcbadc54e925c1e57be7fe876f8c50cbe74d6
+EBUILD mailbase-1.7.ebuild 1042 BLAKE2B 35898d2c02870979a51a278d2725868ace638027427df3b0b3ba3dc4a93aee80ebb22ec28a955ec64e876c0e124ab41b766f057409dcc4b3622d5f5ac958ed4e SHA512 7431582eb7f98a01ad7c37725895e396bfde0ae594195e5640a0ca082850b78f4b81916e2c68db5a67fe41d212a60f9a0a6e3bd768a9d9472dcf482a30999468
+EBUILD mailbase-1.8.ebuild 1009 BLAKE2B 609b7c3d541d2c9076cba2ffd3cdac1462108e7c1283fed428c1d3693a1220dc9460507443d50989a9974e22abbc731ea14f4bc7a4bfa79ce38321ebc632c347 SHA512 440b579b8325136f69c7c0149ce8fb67915f2dcf4e5d5dd1d1a1192c59de8315253b65b63d6bfd6032ccc1d62131513188f54fefc511697ca3bc3f550dde8447
 MISC metadata.xml 248 BLAKE2B d38ae5b3040ee5842bb4351443c08d7114cbaf4e97a2e33c07f8be09bb48f78f6ada7c4b57f13074ffba3782ff54ce080903d4e78197a11bde09b522f5be5731 SHA512 1e8d07fb5bb7bda643da6b3f1f3f858337e9edf1ed24197bd9d77b7a2a399b9b01c9fff3e7267063c6f83c5489d466a13b1ab81e3e1ffdf4fb6687f9152ed6dd
diff --git a/net-mail/mailbase/mailbase-1.6-r1.ebuild b/net-mail/mailbase/mailbase-1.6-r1.ebuild
index 724400f5e450..c8ddcc3a5694 100644
--- a/net-mail/mailbase/mailbase-1.6-r1.ebuild
+++ b/net-mail/mailbase/mailbase-1.6-r1.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
+
 inherit pam
 
 DESCRIPTION="MTA layout package"
 SRC_URI=""
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,12 +20,10 @@ RDEPEND="
 	acct-user/mail
 	acct-user/postmaster
 	pam? ( sys-libs/pam )
-	!<net-mail/metamail-2.7.53.3-r2"
-
-S=${WORKDIR}
+	!<net-mail/metamail-2.7.53.3-r2
+"
 
 src_install() {
-	dodir /etc/mail
 	insinto /etc/mail
 	doins "${FILESDIR}"/aliases
 	insinto /etc
diff --git a/net-mail/mailbase/mailbase-1.7.ebuild b/net-mail/mailbase/mailbase-1.7.ebuild
index 3dd86a87fa2f..242efe827056 100644
--- a/net-mail/mailbase/mailbase-1.7.ebuild
+++ b/net-mail/mailbase/mailbase-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,6 +7,7 @@ inherit pam
 
 DESCRIPTION="MTA layout package"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,12 +19,10 @@ RDEPEND="
 	acct-user/mail
 	acct-user/postmaster
 	pam? ( sys-libs/pam )
-	!<net-mail/metamail-2.7.53.3-r2"
-
-S=${WORKDIR}
+	!<net-mail/metamail-2.7.53.3-r2
+"
 
 src_install() {
-	dodir /etc/mail
 	insinto /etc/mail
 	doins "${FILESDIR}"/aliases
 	insinto /etc
diff --git a/net-mail/mailbase/mailbase-1.8.ebuild b/net-mail/mailbase/mailbase-1.8.ebuild
index 699bdc713711..cda3bb10477b 100644
--- a/net-mail/mailbase/mailbase-1.8.ebuild
+++ b/net-mail/mailbase/mailbase-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,6 +7,7 @@ inherit pam
 
 DESCRIPTION="MTA layout package"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+S=${WORKDIR}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,8 +21,6 @@ RDEPEND="
 	pam? ( sys-libs/pam )
 "
 
-S=${WORKDIR}
-
 src_install() {
 	insinto /etc/mail
 	doins "${FILESDIR}"/aliases
diff --git a/net-mail/mboxgrep/Manifest b/net-mail/mboxgrep/Manifest
index 8ed856d1bba8..8981da803fb4 100644
--- a/net-mail/mboxgrep/Manifest
+++ b/net-mail/mboxgrep/Manifest
@@ -2,5 +2,5 @@ AUX mboxgrep-0.7.9-_DEFAULT_SOURCE.patch 402 BLAKE2B d517138fd5b6a50846886705f06
 AUX mboxgrep-0.7.9-fno-common.patch 301 BLAKE2B f509ad202b6f82afe7d4ef71686198a382fd34bf94ce01753f7db6caaf1a1a1af8ca63682a329de3afc16885a4e0676eddd886227869fda4971cd383ffef783d SHA512 8208a760372f94562ed118e0a7b65a0d7c58291aba5898bd4b951acfddf001f076fea4cf3cae253fba298481e4d684645eca5772bdd71606228d0d06c2c68441
 AUX mboxgrep-0.7.9-ldflags.patch 1212 BLAKE2B 30c7cc0f233d207838b5a24d189f4c442f98f2c3150e99dc202c4438f46f2ebea034e03c60e7f29d6c4bcd055be30b9aafdda37fe404ae44d552d2df631e91de SHA512 9aab0c978b1085cbbb915bd883f7c2b4808b9d5458b2fdbb8bfbeaeab709c9b5f0563c864904253bc0fc84e7e000e4587b755491601e3eabd30154a44d5dfacd
 DIST mboxgrep-0.7.9.tar.gz 76067 BLAKE2B e808f71c730fcf7edcefadcc579ede559a90db1f1a335fcf08a2002903cdaeac36080235450b6bc802b7cb100afd37a831fe6c57b40711aa70334633891d4330 SHA512 d7e768a0ad11bc3df8619f2a888d2943c68ef72dd036c2fe58268686efb50cb1f62ba379571b6cd6efa8493c5ea0d7c09a29520eae6c68f66d9453710eeeba11
-EBUILD mboxgrep-0.7.9-r2.ebuild 768 BLAKE2B 1091cdfd5dd49267c64c267a6bb82e56084251bd598c4b5a56a1e4788c9dc3837dfcd0dd0ef1f083fb05d3068aff61e60c09f396d4b35aa51dc5fbeb87d6b55d SHA512 bdd19dadf470d1173dc7f08db13f57b82b5a30c6a68595d04cfe3b0e0aa626ebb26fb891aa9fbf97eca56cbb9875f416601250eef23ff181f7343728f7ca02f9
+EBUILD mboxgrep-0.7.9-r2.ebuild 769 BLAKE2B 34315723864b639450b00745a06ed41742ed735c3b615f2ce851151bfd66e5bfc2cec06d3d462a3ccff75e3f2594ed21bf55398fda5b39434c1eec4ce877a7ea SHA512 eb333118b1b656d73b638e15cbda88e6e6146b470f315b68c7ad5fa9fcafa23292415f273ebf82ddeed578bb79de1bccbba945e553c3a951d39a5abe53edc369
 MISC metadata.xml 338 BLAKE2B aa7ebf0c275116269fb03197070bad22f22f3ed75a0b3f549c1992df014ad8e7286dc0a612828c44964953fecbd97ab12778da699fcc8ad02c049f946ebfecea SHA512 aeab3e52eeb9899dbb876faad42143f067a245ad4e50101c72094e817f72e124e39ce0b64a6c08f2d30a2c3bdb28d8490acda3830aeaea672a54fc5249db1dcb
diff --git a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
index 9a838372805a..52371d2dfc60 100644
--- a/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
+++ b/net-mail/mboxgrep/mboxgrep-0.7.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ HOMEPAGE="https://datatipp.se/mboxgrep/"
 
 SLOT="0"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="dmalloc"
 
 RDEPEND="
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index dc0e3f5bb8bd..ddb209d71b2e 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,4 +1,4 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
 EBUILD mu-1.6.10.ebuild 1440 BLAKE2B 3e3c39a2691959ac6502772a4543d87d1cf1c9feaf1b2c8d44a2459f782236fa6c96fb42c59e8aa7c409352060a5b5a85361d203f71b810094491cc7bfd2b6a8 SHA512 42341654db5689f0fbecbce749e8653ccdcaf25d7dacd69d531a56ef3782e1ee0f12e307c28cfb8cdac1b749220770a14919476c4663ab0c392f766c146f4909
-MISC metadata.xml 853 BLAKE2B 3439781265eac626261d1717e8ebf8a34a9263b4eaabd37f3a886d1c563c2ae539051741c84b47e8621dfe4513e5213248ba8bcac35dc846bb8676ef5b7239a3 SHA512 4f602ca074a2456393de9394a66de51000351022ef3ad19dd0a2e95d00b70c538f9d96042a979e9e7f714ea9441ca3c52503a4018b15534e0abf1d8a55c7534e
+MISC metadata.xml 784 BLAKE2B ee051513b24805053b4d278d1fe47df2ec0e05458283255dd55efa03b49462b3408ea8b9c4e9b21c7a1b13a00610f5af5f9db504774ed48f8c7dfb97542ffab4 SHA512 98e2efef7b28b462f8c62b053c27d40a624a886d3d813bc2e8e795db01332ae4d7ac7981759f2ac808a6ba238a5705e4834711f3ac7a2248d2824dc3a46df17c
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index a47ba60ed555..e4a573847070 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>matt@offtopica.uk</email>
-		<name>Matt Smith</name>
+	<maintainer type="person">
+		<email>matthew@gentoo.org</email>
+		<name>Matthew Smith</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="project">
+		<email>gnu-emacs@gentoo.org</email>
+		<name>Gentoo GNU Emacs project</name>
 	</maintainer>
 	<longdescription lang="en">
 		'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
@@ -17,7 +17,6 @@
 		<flag name="emacs">Install the mu4e mail client</flag>
 	</use>
 	<upstream>
-		<remote-id type="google-code">mu0</remote-id>
 		<remote-id type="github">djcb/mu</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 0a1ceb328d38..3674f576958f 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,5 +4,5 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
 EBUILD notmuch-0.32.2-r1.ebuild 6695 BLAKE2B 8f01ac8bb8bdef61b1ebb254b3f28d8045fd6261f4d7c811953ede24c95679d63ca8bca74751c9782460217203ba84b024df2797ed78c19ab0cfb429b0e517fe SHA512 71abe966ba3f07cd291cce8deb512278631b7f3ef49e6d1d604ee825ecbed2e2e57859ec54e23832f2196852888440360c91705ac20c833fc0918dd6e7b15783
-EBUILD notmuch-0.34.2.ebuild 7204 BLAKE2B 55363232c92a608522b2d50c876f117ee67eafd79cb610f5c1bdd34bf874d92eb5f5b652b7157ef892c212c92f7f1b7b14c14ddae927fb094ddb1c8a319214da SHA512 a47d245e59a41d2384b64c2c81783c57b28a0e684719e5fa5ca8a0cee140eecc937da9f4c10487dfbe7dd1f59169313438ca6ee5636ca1d0de1c6c2c8eae130e
+EBUILD notmuch-0.34.2.ebuild 7211 BLAKE2B 397c301e4ca03e8a0d4495bf243f511d59bd77f93a397d6a154ff045b40f7bd9728831a58fd2fb95d95ba566f2b4dc28ad8d80ec94921558c235581794c4e3f4 SHA512 1b35bbf1cda635a3c74eefbc323bd22f71a60db93fa7a36b25447045d3d16d1d83f6d84e60cf0a4caf6cfd4196cdbf3e6336931ad49758d6bb60d095afcc1bf7
 MISC metadata.xml 1303 BLAKE2B 0efb03056bdd6b69e5a34feda715557fa94ae797ece1ac650d7ed3719a439069c9fcaf8308fb893048021dbf9b0691ea01096f7219fa5b9367cbb16c261c3372 SHA512 9eb0041d9336fb9778532e4947f37af4ec4272c5fbd24dd0cf26c8779e2e609a7198f107b2538b2e6c2b20cf29e2c648a59275725c00cad8ef550ab9bcab355b
diff --git a/net-mail/notmuch/notmuch-0.34.2.ebuild b/net-mail/notmuch/notmuch-0.34.2.ebuild
index d056fb61c403..c35d6a91e6b8 100644
--- a/net-mail/notmuch/notmuch-0.34.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
 REQUIRED_USE="
 	apidoc? ( doc )
 	nmbug? ( python )
diff --git a/net-mail/public-inbox/Manifest b/net-mail/public-inbox/Manifest
new file mode 100644
index 000000000000..9258707a76dc
--- /dev/null
+++ b/net-mail/public-inbox/Manifest
@@ -0,0 +1,3 @@
+DIST public-inbox-1.7.0.tar.gz 805628 BLAKE2B 4403cd11a2c4f793b136aff07ccc06ea60011c21484196e497921ca36599870eecdf7b93f550ef44e876bca814a3b03e1d8d4b484113506ee809098124cfd1b2 SHA512 cb03d2ec3e28f1fc75bdbff2b8ea5b417898ddb2895d27b105624cab35f0dcab99269d86bfc158bdf42faecb7b7a5734363a81d2202970e8d079bf05fa359250
+EBUILD public-inbox-1.7.0.ebuild 823 BLAKE2B 3d98c16723c2c50e3fd795455db11893fe594254d7cc832adc139d76d76b19b0e055ae2b260936b6512bf1c8f1548b818b26cc3f5649a2e1bc08ae4fa94713f1 SHA512 16535edc771c53ed10b90cb6aa4f400c8ae38f7d4080bdfb5a6600d9b90ec2016cffe5af64f6d36b8ffe28d6913c4d19105ddad0a7bc7953fad76e944d324988
+MISC metadata.xml 378 BLAKE2B 569717fcbe03797e4b5dd1fa859bddbb5947d1f4e51687c05ec955d23d85ba3c1b2cac0eaaa5221800e7db719c5106b1e2f3e9ba3e9594eff649ff2642b154bb SHA512 d5c104ddf9fbd660f6e57e6fb2543c0b5a166f6fc32a7f719a749641ba1a154781ee3745759ad649cba02815607b238b8a85f68580a3830d6d59f143f1dcce0c
diff --git a/net-mail/public-inbox/metadata.xml b/net-mail/public-inbox/metadata.xml
new file mode 100644
index 000000000000..3d9412e88943
--- /dev/null
+++ b/net-mail/public-inbox/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>zx2c4@gentoo.org</email>
+    <name>Jason A. Donenfeld</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-mail/public-inbox/public-inbox-1.7.0.ebuild b/net-mail/public-inbox/public-inbox-1.7.0.ebuild
new file mode 100644
index 000000000000..6d7bfd810fcf
--- /dev/null
+++ b/net-mail/public-inbox/public-inbox-1.7.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+HOMEPAGE="https://public-inbox.org"
+SRC_URI="https://public-inbox.org/public-inbox.git/snapshot/${P}.tar.gz"
+DESCRIPTION="An archives-first approach to mailing lists"
+LICENSE="AGPL-3+"
+
+SLOT="0"
+
+KEYWORDS="~amd64"
+
+# in order of mention in INSTALL.html, going more for feature completeness
+# than for minimal footprint
+RDEPEND="
+	dev-vcs/git
+	dev-perl/DBD-SQLite
+	virtual/mta
+	dev-perl/URI
+	dev-perl/Plack
+	dev-perl/TimeDate
+	dev-perl/Inline-C
+	dev-perl/Email-Address-XS
+	dev-perl/Search-Xapian
+	dev-perl/Parse-RecDescent
+	dev-perl/Mail-IMAPClient
+	dev-perl/BSD-Resource
+	net-misc/curl
+	dev-perl/Linux-Inotify2
+	dev-perl/Net-Server
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/net-mail/qmail-autoresponder/Manifest b/net-mail/qmail-autoresponder/Manifest
index 412d715febed..a74fcc4ec516 100644
--- a/net-mail/qmail-autoresponder/Manifest
+++ b/net-mail/qmail-autoresponder/Manifest
@@ -1,6 +1,6 @@
 AUX qmail-autoresponder-0.97-remove-mysql.h.diff 347 BLAKE2B 9f68bfc64c126d1268630b94f309be16dc8cbc157989c5e3d93b721e4d8f809417d516750db555b99f19f25fc604da59c135855d90dd9017ad3cda6df7ba4f07 SHA512 fa1ae38b8c61c1a67c20653b4e19e48946c140496d7380f918818bc18171de36762c70fc664947a22d0fb479f224d16bb2741374e8813ac46768178e3285f7d5
 DIST qmail-autoresponder-0.97.tar.gz 28158 BLAKE2B b8659f2fd7201a8479b34a43afbbe2efff6a9a72a00167429926564a6323f385b03c3e45c420ac4cea63f52612f9da7acfeacb679f046e1f9019262a9196eb57 SHA512 02bc3afd7a13c9494913986d34c641804c731e26207d32aeff5de36fdbd872d6361872e7ab583d5df1e34fe2a7a35b621337974a2cc71a3283de22f0e6f60916
 DIST qmail-autoresponder-2.0.tar.gz 35463 BLAKE2B 1aa724dd2b0fab0ad62136ea4ef9b65fbb2f3ab567c5dc5676c2be3f52969fa9ebd0b5d0997362a47312efadd97898d56c0721f0f430b51f52cfd6357417fd40 SHA512 d1223b65453cb7c88de5b22a20a961441810e6db1d80ca976599b88cc5771602a678599354b11586e56273c02502b621cfffb610e9ff33632e4a7d7c28766ccb
-EBUILD qmail-autoresponder-0.97-r3.ebuild 1407 BLAKE2B 815dde9e572e6307439219800a4f2da49bd8258ae3ba1360866043b3fa0d17efead2c7e6d43d11551b23e2342478634a61173acbccc24ce92f679f6d10710c9f SHA512 915e2bfe77f87b97eb74325f1e3dccbf012bece429dfaed9a83e0285111628e4a80c2a2a2a364d4756b6e7d66b41d69693665191a06f87e7784a32fec754f352
+EBUILD qmail-autoresponder-0.97-r3.ebuild 1408 BLAKE2B 86a45e618ad1c013db90619fe4aaede21167c4c0f92b4a909a29a3876c90b7f06f8ebed4e482f82e3b122418568d09c9c36d6a31aa4f394a31a8271a938ab5c0 SHA512 3c9410769aafbb7157e623d9f6940143197816b5d3fbf01b01e4db7bc304cb081cad157fa421e37ce637cfdeb8516f6e6880fb98b0643a49abe3675e879ad19c
 EBUILD qmail-autoresponder-2.0.ebuild 1017 BLAKE2B 24ae7c5046738aea9bc4064d17fc6afe52c352e6273978d61b9b3950a92a206499c62c68e0744bcf6c98f620532e1a22f7c1a9c05c1270f9ce19870fb0825f2f SHA512 9bf3f1a7d173af62eb4777e33087910ed695088066470fb88e021c6cd808411f35226129ee8984daaa6f155d0ced7c140b8e19b45b5d6bd6bf8dd2ad3544a384
 MISC metadata.xml 416 BLAKE2B 502d2451318fa2dd457011e29cd1ebc52e9081fc280eb15bba4e2551b82f44ada3c59dcad6963f063c6a6c7dbf997c0e6e5478049e3b5bf7582c8245f355fe1e SHA512 3dfb37a7392b7fd7dff681905fdaeb972b296a75574a27b62aa05e1de0d761013633dcc48f914405dfc45ec0d9d31f5c755ad3181a9e0c82c13340b3c0177543
diff --git a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
index 64b91b1aebee..205a57c00cd5 100644
--- a/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
+++ b/net-mail/qmail-autoresponder/qmail-autoresponder-0.97-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://untroubled.org/qmail-autoresponder/archive/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="mysql"
 
 DEPEND=">=dev-libs/bglibs-1.106
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index 221885699d68..9c3044a649de 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -3,6 +3,6 @@ AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d
 AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
 DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
 DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.15-r2.ebuild 2269 BLAKE2B 62cfc635fdb1a4c31c4f6e6ccd5decd086bffaf40b202e08fd53f79c9400bd274349572d676383fddc53dda2257bd9666cd7236c82624f326ced18392343376f SHA512 5143af2fc638d996bd6a01baaaa925eea66eca47d1071887f0a8735be02e72847dff8ace49a4c1e95398073e1059e7cf7359480d841a81f15b9a0460eea887bb
+EBUILD qmailadmin-1.2.15-r2.ebuild 2270 BLAKE2B 5c8117a6fd32eab1557ec126a1764f4d376f6c1dc57e7ece35e1ca92f61bb8a49c3a174af6c2f122d2857becde73d94c7e685aa36ba718eb536edaece9a5daf7 SHA512 00add24529d8a970c11f42e051ffaada1e6f96698542245dd56edac57df5f735d3d615bb84876a5af769f661f674aa4a6ba2f651c54d44cd91976ab54ffd4b44
 EBUILD qmailadmin-1.2.16-r1.ebuild 2696 BLAKE2B b0dd1f5fc396d4104c74b28ac929c05c2a7b9eb2258a9ab7e9d9c0237e00c1f3adc6f8a3c75509c6b2f11b20156e24b4b7b150f851a0eb3f362205d90c352d3e SHA512 7250ee0d3107326d121ef9ca33718293395388b468428b97528ed94b832f3fafb849ace5d680b45564c3b35717e75d6d6f7a490568a62e6e6e80d1e30e150b34
 MISC metadata.xml 384 BLAKE2B 1f42fb1eeff567ee7271eab2292430a5661709900d3e01db3186eb5d0fd4960f1cb7453d24e5d93ddce2fe1d5fe18c3633ff1ce236394c9f3492d21dfee229e3 SHA512 5e1367d6fae06f20d8a113eaf9640494dbbc2aa23d6509e6e6bdde371fc6d5124035412145cc81d34673b9b95a17af979ce2be7441de87cd0980c443f60536e0
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
index fd7cf19b1cd9..f464af0b8b89 100644
--- a/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
+++ b/net-mail/qmailadmin/qmailadmin-1.2.15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~s390 sparc x86"
 IUSE="maildrop"
 # the RESTRICT is because the vpopmail lib directory is locked down
 # and non-root can't access them.
diff --git a/net-mail/qtools/Manifest b/net-mail/qtools/Manifest
index a4713fb56fcd..a5a77621df21 100644
--- a/net-mail/qtools/Manifest
+++ b/net-mail/qtools/Manifest
@@ -1,5 +1,5 @@
 AUX qtools-0.56-errno.patch 291 BLAKE2B c204bc9a9c210b849f9a4978a7f19e94ecb9e46991a710dd58d9375b332e062f527b6ac274f9c2bc6d1037395e0f17afd920927400c4f72997e491c90b434770 SHA512 ca8fc0fc14724a1dfc9931e24071f0b72ba8bdc3c13c3dc84a597b73e92541043526a288ceb2e260dfb8ab8ce4f970b6505b323458817e499188cc4c6680ba22
 AUX qtools-0.56-head.patch 2117 BLAKE2B 2d0468547e2d67b65be1a8448c9b89f2e2a4ee307a79c47957f465d20671b947ef322af65ac94185cd39a9d98450d517d715c25f182eaab184286cda3d9685bc SHA512 0701bfa739cb163f4463b5ffb1a0242027400fd38e27e2533915f2698712177421f38d9d5b7a02caf1c23ade31bf02ce9236f18e522b688b6adc71af15b32a87
 DIST qtools-0.56.tar.gz 37748 BLAKE2B f4bb79259d2ceb99f21ec87dcc8dac6dca740a9bb1fb723f0393384996e51cdd0a56b92c066161dbcd75adf6d1e008041b5bfdf4abe7534279f504ed2c318111 SHA512 2016ca4f77fc370f6caac56f447325461018dff1f8a61fad305744578f0c26f0495c26d6cba6a8a9d5c86c6ef86635edd69705e9af88f70477a3f6ed121e6085
-EBUILD qtools-0.56.ebuild 1077 BLAKE2B a4f27058b6af1ca00843edd98eed37c5c4cc50d33d756b05e6d645d88c339cb281fafe911cc2929a291ae564fa3b2512acc301e3515f1b0a67217060d6cf6813 SHA512 d3ff25d6e253acbfdc631baf7b1497f5d4d579b8ff675282bd91c52465847bc8a63ed0aed408a1c4ba21ffe0bdee550e9d8c0f4f80f1b9f61e09fd62e0acf218
+EBUILD qtools-0.56.ebuild 1078 BLAKE2B 9aa15b3f1d5992708bf4cd89ff8b1be71c999e5c7b04ed84861358318f64f3a664b25ab17ea26f55457de503146c16549a4c984c8e648dc02310772259c059a1 SHA512 f30562785651e0d4bfa3b5bdca41e3b2c3b6fa040cba571538a1942e902945b2ac5fc2e1e72b13761b8c8eaec1e8d34aa00c924c47a68df92aab071fd2641fe0
 MISC metadata.xml 269 BLAKE2B 43d9731cf9f56bf0639c05f7299cbdadfaaf03fe439dda719287de85a226d301d3bfee81ac2e7f37fc9f25d8e3a3045324f9214e0c1c6c0ff22b1c085a238414 SHA512 818b094a5a00192f09ca69f6ebdb6bfa91f9a94150d2c0861cfdaf0ff78919e5fdac9b58334f0beb73de1f0608372eb86f0c283cd095c0d67224efd9bb5d3ddb
diff --git a/net-mail/qtools/qtools-0.56.ebuild b/net-mail/qtools/qtools-0.56.ebuild
index 16477854ff3b..645668065bf2 100644
--- a/net-mail/qtools/qtools-0.56.ebuild
+++ b/net-mail/qtools/qtools-0.56.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.superscript.com/qtools/${P}.tar.gz"
 
 LICENSE="all-rights-reserved public-domain" # includes code from qmail
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="static"
 RESTRICT="mirror bindist"
 
diff --git a/net-mail/serialmail/Manifest b/net-mail/serialmail/Manifest
index 2c112e2de9da..3da88950ee2a 100644
--- a/net-mail/serialmail/Manifest
+++ b/net-mail/serialmail/Manifest
@@ -2,5 +2,5 @@ AUX serialmail-0.75-implicit.patch 965 BLAKE2B 1e0d173dba771330c8eb9993b3a442816
 AUX serialmail-0.75-respect-AR-RANLIB.patch 560 BLAKE2B 0198b3d97c956dc28645176afe849ad7fa0d91d35412677d48432616bb7017c77cd540a4a27b91b2e34e5afde42e3bcee4958313dec31b15c9717ef3b54fb21a SHA512 f1de8fade3884acf8e1a7fc38192a831c66e89579a4e98fba871124288a2f307a46891a70f877261c125303cf3bb6858f2a6eaf47ee004233211b36b3860f55c
 DIST serialmail-0.75-patch.tar.bz2 7702 BLAKE2B a1593c15dc086d78ee6b605197d616da8a50d67e9a7fe79fe1f4aa5b9664b16bd3eb9dcea79902fbe4fbe7020d74870d72c2dcdd3c1dad18506b54f0f0ea5357 SHA512 da1eb9a9a834fe5a9db4233d1a7e09657f5a2903f3356ebd6922f03c7f4833d96b4b9ecfb3412733dcdd3b384e503b25fd2564d0f93c639a7a9409872dc52c25
 DIST serialmail-0.75.tar.gz 55079 BLAKE2B 9ab05731069819be14d3b7cd56b2ab4bd2e87fec7867f4243d8180fd42eeb7b95b255c48ea8dfe06918b8cba772b228c7594ddef6c56d3bcb80d0ea19da4935e SHA512 f0c7f14330b44f12f8e5f3590416d707bb2daaca84db8fcd236ae05855269005a726d946269c0cbb25f51238fba350420e0e3a1d57f0ab227c447fafcae497dc
-EBUILD serialmail-0.75-r5.ebuild 1311 BLAKE2B 7cd31971e68f804e83acab6d33f7d32332cfec703f458e5db671ad50a9976b68dc630d50d7a150b4a9ae88dced0bb59695fabfe2288eee170f061ca27f7f946f SHA512 1359bf48278f48d549d876089e83d78c83bb3e36adcd21fbcd158e3b404196000f036a3692610bad75edbd366f20c16946cb2aa2f223f698417c337c67a35743
+EBUILD serialmail-0.75-r5.ebuild 1312 BLAKE2B cb6fb2f48438e82edb3e7f7cbe7d2611444c7d08cf359877ea4038cefb90e582ec1d052a72e2cf616772d77d62c1345280437b9c575ea02f263f1f30d528c9a7 SHA512 fa40a7f48ba83599201b6ae1198aad05f4f58b788fd66003751c7dd6f77df193809b342bf31a2c448fd7952ac89530971c72d7cae34953851366b05ac4d7eb1a
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/net-mail/serialmail/serialmail-0.75-r5.ebuild b/net-mail/serialmail/serialmail-0.75-r5.ebuild
index e7b04e421d3b..e0ee8b24b777 100644
--- a/net-mail/serialmail/serialmail-0.75-r5.ebuild
+++ b/net-mail/serialmail/serialmail-0.75-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://cr.yp.to/software/${P}.tar.gz
 
 LICENSE="all-rights-reserved"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="static"
 RESTRICT="mirror bindist test"
 
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index 3d7f1b712048..4f01434050c9 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -2,5 +2,5 @@ AUX smtptools-0.2.3-autotools.patch 3951 BLAKE2B d3d60ac0ace9369e66c23487fb2dddd
 AUX smtptools-0.2.3-cleanups.patch 1830 BLAKE2B 7d634aa4e21572cdbc0f4e94e18ad0fe45010e331d9b121e8454faa696285a60ca97c5dc74567eb4afd88e4444f4da318f75c02b70d4f5c9ba6b2d2664b68fcd SHA512 55db66e01d6a252e4c9c265de2c14e40a92b5eb33421d05879823a6fc1e37e1b80951bf84087739f39e32850873371461a604584e465576b6f3b269b2ff83085
 AUX smtptools-0.2.3-fno-common.patch 651 BLAKE2B bfdceebddf4b6631d53e94b5e90522412de5dacfbcc006624a53bbc4f1c2f32437f93f928a88440dae4c884b28ef249f2eadbd4dbda2018ff73c07635acf4fcd SHA512 d9cfb1abd62f6dd3f57b3288e1adc18cdbedb6c296c7516535b406ff52393ea177afd5d22480b5be013d18497c670e0569d9ee1476298f58824a33d99f251d42
 DIST smtptools-0.2.3.tar.gz 117859 BLAKE2B ca1713dc4ec668de1491423c7463cc21fa460017744c34bf6ac5619294ca6bdcda8b78ab3fcf1b2225c3c3897b7ada89b48ab68defdae28a69543fa713362e87 SHA512 2d5f5a4fc5d25e5b652800047c7dcba62eb033919e485e42efd07be0e00062f9d89200dd0e65991a13b1366b5b28bb5c2d84d0468e71d05d1540178111b3cf2f
-EBUILD smtptools-0.2.3-r1.ebuild 666 BLAKE2B f5f54d41eb29cd93db6a82a72f730ad66e0e4e9a9b5fac19f5dc9d32e1c70090fd3ba9198289ff75cc8af3a4378de0cb9b52d9986113f3afad447497d4f6e570 SHA512 81afde1a40024db58ffb206a4d65777d8826b9f378c35f213e02c68fc012754a4b5bf3b1d77d1200bbaf2de220f6474dd37bcd2faa3349dca9472f16116a8bf4
+EBUILD smtptools-0.2.3-r1.ebuild 673 BLAKE2B 26d10ffa92d64e16df6b27f131384839cab527220922de1db0e24dc1d8a90bc75c6032cd1a249794426bd00ac0891d7ef4ed3a28fa32327e3703b0e0e7809bc2 SHA512 f7ac7ce6940d26446a815b2ae44d3d2d731d4329a78bc6a60429f600fd1cd9600e3f3e12e3690acadb621cea6dae4d148b2ead70a17fd7bbafa89f14514b78f8
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
index be42f11b7cd1..2ea5806a5d96 100644
--- a/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 x86"
 
 RDEPEND="!net-mail/qtools"
 PATCHES=(
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 3a848f8e32be..c780b286eb87 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -15,5 +15,5 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107
 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd
 AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9
 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab
-EBUILD vpopmail-5.4.33-r9.ebuild 7739 BLAKE2B ea3aac8a884fe1e8d23c9bef072dc610e1c0328028f82773040aecc2d347de11d0166c4482ed4ee0fb27ff9bdfb2eded758e3e03b389c266c1d9e2397e1f7572 SHA512 9b0a5926580beecb63d43a9ed462a3cf2f1b42464bf7e193b7b9fd74bc6e3939192eead6f33454b99519cd2b9df801a8ebac03a91d765b3b557f96373b8b32eb
+EBUILD vpopmail-5.4.33-r9.ebuild 7740 BLAKE2B 30229799e5b8fc43cf2cfad6c52f4abc64dcb5d08e9f99a208262f1f91cc7792fe32cdd010353a2ef26cc1c1c515e850c08b061ed4b08e60897593b92a6d5525 SHA512 69b4749a55dcd4cff53d70063860ac007e04ea8d6a1414579664995559aa96d6e4999a378f902da1adf2d906f468690037ce3cd84fb5eb89b7442622f494ff0e
 MISC metadata.xml 829 BLAKE2B d3038dec96c930fd0c198a002c721464a0d4eefec9e4a4c5a3ff8378e54ba9b711e828feff2fdf37b2f77919816846de7796e4887e2be17c918a4c7036c49f29 SHA512 7580b8cb9d985908df56be493add629de636f03ea7154872b06ae15599d9a71ca4637862d0331b792e1106ab64f73f212f8491676179b376e0f2c1fd894a1b41
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
index b70518ef1783..3419bc0e552c 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 
diff --git a/net-mail/vqadmin/Manifest b/net-mail/vqadmin/Manifest
index a2f695e3b514..0956cb62b1f0 100644
--- a/net-mail/vqadmin/Manifest
+++ b/net-mail/vqadmin/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 291 BLAKE2B 2d02039a95ecf734d6dd284fcd65911c9f38db8a2165d1bd4289a9927a3a3c847a99991c1301a5d6d9d485ccd06794dddf73f57dabee47dcb3ed01ff9a0f7f72 SHA512 27c4b4314b29547e3a485340086186c31d0d5ede249631738227ffdecd64c500baf7c3ee6852b02e18176376f0717c35ad3445b5a2bc684e82772eca27be2786
 DIST vqadmin-2.3.7.tar.gz 153678 BLAKE2B 3906c449d89e2747d10b9a4afdce14da7b41fdaca760d41b0374bfdd6a8dd2f756597b4bbdabb4d03b89806936e1550f069b7675dd2ef7486f235e497191bf94 SHA512 c427dc4b1e30926b0d3774bd0d296bf78a98037c566a82fa790f7a25d1fac64a80172498fd6342e93514108e42fdec0ebf1a76029546e43100ebcae5b845ef88
-EBUILD vqadmin-2.3.7-r1.ebuild 1303 BLAKE2B 5873980c5e12d79dc438e2c6d33b10927a90ac9708c21199e6fd537b2285fe9d41906416130cc3308b6e5a24da2a5da73b63eeb3daf91cca297d90fd533dfb46 SHA512 965c60fbaf4f57d678e11b21635881048942f46845204c8dac10e62585765db74ea6cf71568b055700f855ae2f9638547bb4e1da27e4eb38103bb32906ef225d
+EBUILD vqadmin-2.3.7-r1.ebuild 1293 BLAKE2B 3c2b0f39b9d45e9a71886f957d370f3375ccd9c1346622c754f40b2aa7a11a124936638ba2c08aec3f5e523273dcdeb9cbd2028f61d71567fa95c101e3aaa99f SHA512 aa7fe5676bfc7c80d3bf2e665e4f58117155ffb55c1c29b1ed51e3e6a588bef47be45a1f7a80d62dba94f2463c927b4ee26be71eb9ae149fadd3d1dbcee66967
 MISC metadata.xml 358 BLAKE2B a245cced224214d846908b878ba3db70eb2b8a5cd64fed4a08316922015c4c7bd7af7ead71d16264528051603b2e484b13ad8c53dd4d713e5609dd2b8ed3a8d8 SHA512 e28a7ae98186af72d792c168008db2400a9dfd4887f51e45f6383e3a5227e2827436dc415639933f1c10181f1b7375dc6f257ee47ce65b96c1fdd2894e424af5
diff --git a/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
index a89f49b9d5c3..f5b26af2ae3f 100644
--- a/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
+++ b/net-mail/vqadmin/vqadmin-2.3.7-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit webapp autotools qmail
+inherit webapp qmail
 
 DESCRIPTION="A web based control pannel to manage Virtual Qmail Domains"
 HOMEPAGE="http://www.inter7.com/index.php?page=vqadmin"
author	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-03-20 00:40:44 +0000
commit	4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree	356496503d52354aa6d9f2d36126302fed5f3a73 /net-mail
parent	fcc5224904648a8e6eb528d7603154160a20022f (diff)