commit:     a489c9343b03c19a13e21716e29e644094da8de3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 11:14:22 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 11:14:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a489c934

net-mail/cyrus-imapd: drop versions

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-mail/cyrus-imapd/Manifest                     |   6 -
 net-mail/cyrus-imapd/cyrus-imapd-3.0.16-r2.ebuild | 231 --------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.17-r1.ebuild | 232 --------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.0.18-r1.ebuild | 234 --------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.4.2-r2.ebuild  | 233 --------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.4.3-r2.ebuild  | 242 ---------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.4.4-r1.ebuild  | 247 ----------------------
 net-mail/cyrus-imapd/cyrus-imapd-3.4.4.ebuild     | 242 ---------------------
 net-mail/cyrus-imapd/files/cyrus.conf             |  41 ----
 net-mail/cyrus-imapd/files/imapd.conf             |  50 -----
 net-mail/cyrus-imapd/metadata.xml                 |   1 -
 11 files changed, 1759 deletions(-)

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index ef9fd5701264..da14e74b3b1a 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,7 +1 @@
-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

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/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>

Reply via email to