gentoo auto-resync : 02:07:2023 - 22:04:01

12 files changed, 2 insertions, 1772 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ca3dc46f847d..8e345c6909ea 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,24 +1,9 @@
 AUX cyrus-imapd-3.4.4-0001-Test-for-libm.patch 925 BLAKE2B 9011250df2c6a1cad4ae276b777e9e7bbe82fe50c76684eb876a97279612aadad1d264480adfb695a00d8fa50709d2728b2395b53c7559540fc21cdbac5255e0 SHA512 3339367ed754c41aac09e10ba3281e5c432f362a963255e93a47b6e41342f187c7fc67a474032f0bf888d586335f587d92f82066de9dc586641e3fb12cc7ccae
 AUX cyrus-imapd-3.4.4-0002-Avoid-underlinking-libcyrus-lm.patch 789 BLAKE2B b9cedc49c4b5445189887372c0b4ec365d6727b82aaaa40e0a54dddc3e7fed73bc5b7a29c90bc3d7a47cd34f9fad13df5b43e8f6a6cee12e6c110367653be155 SHA512 ac55e006234d7567daece1acf77cd1c6f30ce23316ab3450635a08fa38d3e7f125c824a74e77fe46678b873b7f3f84d6232a5b2599ef63a3adc7acc57cdc3ce0
 AUX cyrus-imapd-libcap-libs-r1.patch 2175 BLAKE2B 7160b277538c43f2304f676b8d7d67034fe3724d3dfc52f6111a4191aeeb502eaaaf209c6c2cf90bf3b61a8a1dc8c536b926a7df20a6740e36b0e8ba18d5faa5 SHA512 395c07b905745a7b6318aad1a17116df90fa9aadc49d1957289bf3c5afe1c94b63723304087488f0d81b16e6875e5c261fe398c2be18c1a356982609a75034b6
-AUX cyrus.conf 1236 BLAKE2B 291a113314a0b89b200360473aed65d6542caeae02e251e2eb88db4abe01f4a367c0a65da939d94b81fafe68aaa1e788ae5f37bc6aa43fa07e52c0b1636ebdf6 SHA512 e4e02ddd02b7c77a1b43ee49f7ab9dcada1d518aaeae6e285b206d67d05b96a2f9007264967984c18cedc62cd1e9e9f59c802eb37da6e77d6990db7ced5e559a
 AUX cyrus.confd 164 BLAKE2B dde11def651971e4b8f52bf2aa1f32db8c7ab7697eecb66a73fbe6f30b0b7954d21e97c3afda7a61c1400079a91de7df24e0a7beb83d3501092f132ba62142cd SHA512 52fda6a61a3cd1a4fa7579ea0eb1c9cba857f59b8ca9145f8bb73731c2a7e7f798663ef38b8c646aca066b0f571928fd13b2463415f8afd142fa45626ad8db20
 AUX cyrus.pam-include 109 BLAKE2B f241d45aead08952c5c7cbd6a8a25ca6926ec99703b0e879de2176b1d348efaab0b6547200f10e65a18f1926dcbabe74e5d7eaa9b9a7c7039a35421671b5ada0 SHA512 4c96d5b0a675ddb83f26200a8cbd18c7b663aec39eb78f8509751425fb062e39e6d13e4d06090c6765b32e1cce609db075d725a18cbd4638a7f8ce5c858c47a4
 AUX cyrus.rc8 716 BLAKE2B d74c976719ee9baf5fe7dfd43336de8c513ac9fe1c2463fb092bcb9b7fbf81f70361cdbfb81682b985ef8a733f37edb2e32970bbf1344413cf0a50ef2a3e49c8 SHA512 c9e3df789d60d8118191487f36145f8c3db2221a954d82b1ce339fb52378fbe1b2ed4760808063e79e99461e3dfe931ab947669293353e00d0b3f057bc56ba7f
-AUX imapd.conf 1471 BLAKE2B 5373950ac08b630a82fc00b5bf3fed9d400e092458310b64cb669e46470527b864dd5c960bae38f10fac10ca884291ee05203f4c380db57f750fb49217ca7a96 SHA512 dd19551b6e254c5e132f28748435ee61f2df86d6503643cd4946efcfba998d7bd487818ceaab1ca320289077eddd2531f6b05a493a5b5040ee5121165c3a712f
-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.0.18.tar.gz 11465046 BLAKE2B 74b0ad899341959dd70f872fe5c190ddf5f4452834b0ee3f339b7c6c1c925d2a3ce091b826881fc3077aeb2ac0f9817f275469473155452236f5385134e3bcd7 SHA512 e4c2ebd979223ad577bf2d91299c324e08fa9e8a7871ef99d2db9e3ea29b44d170c36aa57ffe84bbbdd28014d06af9c54d5e72eb18036d5ee8aed910f45f5941
-DIST cyrus-imapd-3.4.2.tar.gz 12603768 BLAKE2B 515c36fc3d6a29991283d47a3e523d87a68c3191b4aae85074f40b2416fe3a89793f1991dc5729912a3d56247f6fbf4aed52abcadbc37ca7cc9bf857a8641871 SHA512 4d7d14e222bc1e97b2d8188804139c4c477de66cb621caba475b57533739ee59d88504d4f47735bb6a6b3c9097dbec382ecfa2c678f978791b9a6956a3cd91d6
-DIST cyrus-imapd-3.4.3.tar.gz 13182110 BLAKE2B 485df8e2518a55a3b096d0c330d55f7ed93209ca4ab5851dda53083082e203ad9b1d9218c0863a9bd1e678a732427ef499ff78bacf2d3fb2fe18464186a9e6d2 SHA512 5c4db2a0c26d2323332c1ba67f7b207acfad15f0442f20c6c8a205b5423498465524398315946213c8168bc7eba1fd9f7dc573a91efac6708bfbaf2cb57e9276
-DIST cyrus-imapd-3.4.4.tar.gz 13236335 BLAKE2B 105ae3defcf321a01394b38672b080ea58f68ecdc41384af46186c6ef88c02061ac066bd3e382d7b649761d5e462f2310a4568989c87e5ec518e08051179f4b3 SHA512 7904a9d0535e9d606bbb7748a4886e10092e2b682180dddf94933199f19402ae6f5cc4472a3797decf9ef20d3a8b7f1715ab00f6751037f14b19cd7322942dc2
 DIST cyrus-imapd-3.4.5.tar.gz 13291987 BLAKE2B 4ac383ef7f3dea66a7dc11c2241b8663e3cda323b73e3b439255468cf9b6d80302a135793f952843ddee418acb4aa4a9a9d56fcb743b5d589d535764c2289c1d SHA512 e43185193130af2e11ced89b2241a7b6f321847cf8bc01c0d89cbbb1cb222a962fe00cdd54b1f89cea141a569b57d2ce2f0edffaca8db9fd5f7fc2cd82b4537b
-EBUILD cyrus-imapd-3.0.16-r2.ebuild 6016 BLAKE2B e85d06a61f6c6573624cbbc92a118712dde2e095174fd7726ee09d4e765d435613e0534d7a76d0df4c94118207b799507d18d27670607c852c12c2b74cb127cb SHA512 35ac8660c0d6812b162083004559dd71ddaef2ea7d34320901b2639a4d6033bbe0d7b448292df2117a5cd03f3469e172cdc6b9645281979a6befe85ab56edcbe
-EBUILD cyrus-imapd-3.0.17-r1.ebuild 6022 BLAKE2B 619618570289290e0a697e9280a18f249ef8898d1324f77f43b8ae0b275694f7b4f94b34ad822e4c90a923ed86b5d542d8b232e3a762aa093f353c0aad721f74 SHA512 17bc28ca592afc4c6a29fc765738c41c753e1f58996c40017d24c81584bf58493bc9e619ed36b4a6b6c90003cc9c4cd6e392f89a7b252bde16ed07af30240dbc
-EBUILD cyrus-imapd-3.0.18-r1.ebuild 6073 BLAKE2B 2d5a6d91956101f6533428c20dcb3389b0a89a95de3218301c115375616cdd4f949d466f07f41a8916825be4756ea991ba2f86cb837c1cc5d65e788c67b3314d SHA512 7575752a537a9717b4bf69597db997c6a1c9ce67fbdddbcc431d02f2e13570319f1137258fe382fb54ee2c94e0ef32448db770d26d2618783917c7a76055e53f
-EBUILD cyrus-imapd-3.4.2-r2.ebuild 5964 BLAKE2B d3b7b21d6da88a922562ab86a32995c89c4e18b550b20eef3e1f7c7b152262b01c0b57839b12acbe7afff20be07908557a43669eb853c1cf44ad2899a3cdba30 SHA512 c7645c12b7506b83f7db973eea2719f9fb4ce902ac312338df9c5a2faca0e22520c8af04c9e0e65348b672d61796789952b910a8e60b8476c876360e05d85d63
-EBUILD cyrus-imapd-3.4.3-r2.ebuild 6321 BLAKE2B 3eccf55354b1f938e5cd487643ad8c8889d595d3426a305dcc72ec0aaaa85c05b4b9b9a95672a2ae3e40bfd8ae91b7bb9d278d08e006e64df7d29a7f0aad3124 SHA512 0e70efd6187c9c1e036d8c33e25dc0529a747f4425c01ff6c3144202968adc6fce8bf6ca806e96631e547c1497ff294301f7d6b8c61e59c43f67ecc404748aee
-EBUILD cyrus-imapd-3.4.4-r1.ebuild 6453 BLAKE2B 27e483c6ddaed107297251f04b7e5c418751a59f52e2084efb88e0c78fce1560eae89db85a7640d16ae7cc6356f0e938618cfe14aacd9ee885732d7305aea1cc SHA512 832324154d6d12ca19f90d239674b9d41e8358fc1182dfa9c5b2e505bc5fc6978989655d5969f82fb95cf1f7f761f8130d820e1d450985f3fd05aa2ba8314e25
-EBUILD cyrus-imapd-3.4.4.ebuild 6319 BLAKE2B 943653d3c178feaf9b06365aef6540dcbbe241353354d3f8fe8b849aafb3f0c3fc40ed188ee21ddfa53c01a436bc4451ad758345e72d32e318912b17811116fa SHA512 5d8571518cd8f2e5f354a62985d896f6f082796d0430a7a5f63e50c70755e2733541f6c5b23abdec1aeec2076e5314a4c648995c690eb4c9507e7523964ffbb0
-EBUILD cyrus-imapd-3.4.5-r1.ebuild 6504 BLAKE2B bb0d55b7fc1a178d6ae923eeda8ad088a9ec59a4568750a9a390b6a6d2a8f9f71477b39f9ab14334e9e0b82dd804bba641f75737a785c38150a93001d9ea91a7 SHA512 c6f98ca5459c0630d8723ae9234103f1b0ed3f0b60d935fc2872d575862703c4a208554b34ea51b459b77cd166741401fd9f489bedcadd8e771b756f2ffab4c7
-MISC metadata.xml 756 BLAKE2B e67e371c0daf545e354680a35bbfda109d5bac966c75d048f3fef045def983410926fb02bd9f36906251b32696cba41733969912c0d5a5496717de0626fd10ae SHA512 0e558ce2562227134bb7c5ebc95b44b353b2e4361744366862708ff8942a1cddffb931d58811fa6c511b7057a083e05c47c76453ba3dfba89d77ba8db0402b7b
+EBUILD cyrus-imapd-3.4.5-r1.ebuild 6465 BLAKE2B 18458fdd1e8fcfd7b76003fa77ce8f33083e68bd1a12dd46b2f10127b1843e6b00945c4763599e6d2cafe239599970f04dd6593efbdfa9f760fe5012e3070d1a SHA512 152eba67be7f4342afbc4c7a1dab1604f16cd69ecb1c0dc76b005ada00c1c5216f8b6f2f3efaa9f7cbe40066aeeebfdaeee020aff4ec0493a21eebe4e0353104
+MISC metadata.xml 681 BLAKE2B 688190e41d85f479480541854f7b253e08307d857dddfea02406fb5272d7cf5dab8d99c93ae2f03f9ebabfcd83bd5b92f76d903c899d761c66decf3d97f849c9 SHA512 289d890f2f8f9b0ec860e175d360c570329e06724e9a515c8fcc77c5ccab4e15f6d4fd3c6174f277e425e01f2a0444e4cb030128a94a762e41fddb338cde6e38
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
deleted file mode 100644
index 06d4168cf795..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson:=
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	caps? ( sys-libs/libcap )
-	clamav? ( app-antivirus/clamav )
-	http? ( dev-libs/libxml2:2 dev-libs/libical:0= net-libs/nghttp2:= )
-	kerberos? ( virtual/krb5 )
-	ldap? ( net-nds/openldap:= )
-	lmdb? ( dev-db/lmdb:0= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	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:0= )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? (
-		>=sys-apps/tcp-wrappers-7.6
-		snmp? ( net-analyzer/net-snmp:0=[tcpd=] )
-	)
-	xapian? ( >=dev-libs/xapian-1.4.0: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 "${D}/usr/share/doc/${PF}/doc/examples/cyrus_conf/normal.conf" cyrus.conf
-	newins "${D}/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|' \
-		"${D}"/etc/imapd.conf
-
-	sed -i -e 's|/var/imap/socket/lmtp|/run/cyrus/socket/lmtp|' \
-		-e 's|/var/imap/socket/notify|/run/cyrus/socket/notify|' \
-		"${D}"/etc/cyrus.conf
-
-	# turn off sieve if not installed
-	if ! use sieve; then
-		sed -i -e "/sieve/s/^/#/" "${D}/etc/cyrus.conf" || die
-	fi
-	# same thing for http(s) as well
-	if ! use http; then
-		sed -i -e "/http/s/^/#/" "${D}/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
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
deleted file mode 100644
index 9346b47b1dab..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# 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.0.18-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
deleted file mode 100644
index a9eb170fa2a1..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2023 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
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-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-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
deleted file mode 100644
index 9d13260102be..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-CDEPEND="
-	sys-libs/zlib:0=
-	dev-libs/libpcre:3
-	>=dev-libs/cyrus-sasl-2.1.13:2
-	dev-libs/jansson:=
-	dev-libs/icu:0=
-	sys-fs/e2fsprogs
-	afs? ( net-fs/openafs )
-	calalarm? ( dev-libs/libical:0= )
-	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:= )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	nntp? ( !net-nntp/leafnode )
-	pam? (
-		>=net-mail/mailbase-1
-		sys-libs/pam
-	)
-	perl? ( dev-lang/perl:= )
-	postgres? ( dev-db/postgresql:* )
-	ssl? ( >=dev-libs/openssl-1.0.1e:0=[-bindist(-)] )
-	sqlite? ( dev-db/sqlite:3 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xapian? ( >=dev-libs/xapian-1.4.0: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
-
-	# 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 \
-		$(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
-
-	echo
-	einfo "Please see https://www.cyrusimap.org/imap/download/upgrade.html"
-	einfo "for upgrade instructions."
-	echo
-}
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
deleted file mode 100644
index 84009a8c6375..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# 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
-	app-alternatives/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/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
deleted file mode 100644
index 33031ad0dced..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# 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
-	app-alternatives/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"
-#)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.4-0001-Test-for-libm.patch
-	"${FILESDIR}"/${PN}-3.4.4-0002-Avoid-underlinking-libcyrus-lm.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/cyrus-imapd/cyrus-imapd-3.4.4.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
deleted file mode 100644
index 15b1b131ef6f..000000000000
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# 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
-	app-alternatives/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/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
index 5a7f7b4e6204..12a307abf989 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-3.4.5-r1.ebuild
@@ -60,9 +60,7 @@ 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
diff --git a/net-mail/cyrus-imapd/files/cyrus.conf b/net-mail/cyrus-imapd/files/cyrus.conf
deleted file mode 100644
index ab084d51a024..000000000000
--- a/net-mail/cyrus-imapd/files/cyrus.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Standard standalone server configuration.
-
-START {
-  # Do not delete this entry!
-  recover	cmd="ctl_cyrusdb -r"
-
-  # This is only necessary if using idled for IMAP IDLE.
-  #idled		cmd="idled"
-}
-
-# UNIX sockets start with a slash and are put into /var/imap/socket.
-SERVICES {
-  # Add or remove based on preferences.
-  imap		cmd="imapd" listen="imap2" prefork=0
-  pop3		cmd="pop3d" listen="pop-3" prefork=0
-
-  # Don't forget to generate the needed keys for SSL or TLS
-  # (see doc/html/install-configure.html).
-  #imaps		cmd="imapd -s" listen="imaps" prefork=0
-  #pop3s		cmd="pop3d -s" listen="pop3s" prefork=0
-
-  sieve		cmd="timsieved" listen="sieve" prefork=0
-
-  # at least one LMTP is required for delivery
-  #lmtp		cmd="lmtpd" listen="lmtp" prefork=0
-  lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=0
-
-  # this is only necessary if using notifications
-  #notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
-}
-
-EVENTS {
-  # This is required.
-  checkpoint	cmd="ctl_cyrusdb -c" period=30
-
-  # This is only necessary if using duplicate delivery suppression.
-  delprune	cmd="ctl_deliver -E 3" period=1440
-
-  # This is only necessary if caching TLS sessions.
-  tlsprune	cmd="tls_prune" period=1440
-}
diff --git a/net-mail/cyrus-imapd/files/imapd.conf b/net-mail/cyrus-imapd/files/imapd.conf
deleted file mode 100644
index e77ff2f4b887..000000000000
--- a/net-mail/cyrus-imapd/files/imapd.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# Don't forget to use chattr +S (if you are using ext[23]) 
-# when you change these directories (read the docs).
-configdirectory:	/var/imap
-partition-default:	/var/spool/imap
-sievedir:		/var/imap/sieve
-
-tls_ca_path:            /etc/ssl/certs
-tls_cert_file:		/etc/ssl/cyrus/server.crt
-tls_key_file:		/etc/ssl/cyrus/server.key
-
-# Don't use an everyday user as admin.
-admins:			cyrus
-
-hashimapspool:		yes
-allowanonymouslogin:	no
-allowplaintext:		no
-
-# Allow renaming of top-level mailboxes.
-#allowusermoves:         yes
-
-# Use this if sieve-scripts could be in ~user/.sieve.
-#sieveusehomedir:	yes
-
-# Use saslauthd if you want to use pam for imap.
-# But be warned: login with DIGEST-MD5 or CRAM-MD5 
-# is not possible using pam.
-#sasl_pwcheck_method:	saslauthd
-
-####################################################
-## This is a recommended authentication method if you
-## emerge cyrus-sasl with 'postgres' or 'mysql'
-## To use with mysql database uncomment those lines below.
-
-#sasl_pwcheck_method: auxprop
-#sasl_auxprop_plugin: sql
-
-## possible values for sasl_auxprop_plugin 'mysql', 'pgsql', 'sqlite'.
-#sasl_sql_engine: mysql
-
-## all possible values.
-#sasl_mech_list: LOGIN PLAIN CRAM-MD5 DIGEST-MD5 NTLM
-## or limit to CRAM-MD5 only
-#sasl_mech_list: CRAM-MD5
-
-## change below to suit your setup.
-sasl_sql_user: mailsqluser
-sasl_sql_passwd: password
-sasl_sql_database: mailsqldb
-sasl_sql_hostnames: localhost
-sasl_sql_select: SELECT clear FROM users WHERE email = '%u@%r'
diff --git a/net-mail/cyrus-imapd/metadata.xml b/net-mail/cyrus-imapd/metadata.xml
index 5e5c1ac2074a..eedfb0270ce7 100644
--- a/net-mail/cyrus-imapd/metadata.xml
+++ b/net-mail/cyrus-imapd/metadata.xml
@@ -10,7 +10,6 @@
 		<flag name="backup">Enable backup service support</flag>
 		<flag name="calalarm">Enable CalDAV alarm support</flag>
 		<flag name="xapian">Enable Xapian search engine support</flag>
-		<flag name="lmdb">Enable support for using <pkg>dev-db/lmdb</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">cyrusimap/cyrus-imapd</remote-id>