gentoo resync : 20.03.2022

8 files changed, 493 insertions, 15 deletions

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."
+}