commit:     435ad104b9a7e9cbf65b0cab5617336bb0e87244
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 04:50:51 2024 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 04:51:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=435ad104

net-mail/dovecot: drop versions

Bug: https://bugs.gentoo.org/937955
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 net-mail/dovecot/Manifest                 |   4 -
 net-mail/dovecot/dovecot-2.3.20-r1.ebuild | 302 ------------------------------
 net-mail/dovecot/dovecot-2.3.20-r2.ebuild | 302 ------------------------------
 net-mail/dovecot/dovecot-2.3.20-r3.ebuild | 302 ------------------------------
 net-mail/dovecot/dovecot-2.3.21-r1.ebuild | 302 ------------------------------
 net-mail/dovecot/dovecot-2.3.21.ebuild    | 302 ------------------------------
 6 files changed, 1514 deletions(-)

diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 349f1f213a6b..e22ced3458cc 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,2 @@
-DIST dovecot-2.3-pigeonhole-0.5.20.tar.gz 1945126 BLAKE2B 
6845896f9bcfb26f74b0ecbc8109cfc2cd67492742aea2459cd74695d165c6009552b7178f370e06281440270829decc3f5fad9590b984ca3ff10267f4cf3e02
 SHA512 
45683e6bd678db00fc3e3c61d27a264d30d0e9aeb9ceb7ab55f94f0317d387056fa092e266062117cbe2a9dc2c90ddca03d154e78aad9c0d61fe8cf2c9187603
 DIST dovecot-2.3-pigeonhole-0.5.21.1.tar.gz 1956404 BLAKE2B 
ad0ea5c2c181aa9cdf12a7b58141a9812cad11e6ead4d4f38366e13589a84135db1998da179192a6e66a53240647906d96bb330982e7f2f204ba8c402f14cbbd
 SHA512 
7387b417611599fe70d1a83d3b408321e66f5a883bf78a9d55c7496b1a17220677daebaefde2061e0d7064fe07c410ecfc64662878bb253ddcd9e128dd83fbaa
-DIST dovecot-2.3-pigeonhole-0.5.21.tar.gz 1955945 BLAKE2B 
91c4f5b2c21ef0f74ea4661abb94bd86beda6449642ec8ef6b2f48e86b370f78eb6b63f2ffb382cff500137a6723b6b4589548c3b8e415f0caf36c2e6b8b7cf4
 SHA512 
5537444025a474ee1b79919a424e24530695aec639361c531257f25fac286673719d476906d99d47e348deb57baa75419bff7dd284c82d2b751334dedec96314
-DIST dovecot-2.3.20.tar.gz 7805735 BLAKE2B 
e041c68a8c2b4b1068f526554d92caa5806a4d3854cc4a287633e4702f764b68922e368426b1bb395c9dab92183e9568f8c8b6ff5491a39f1a28e818be1afec8
 SHA512 
20c5a9cacf2c22d99d46400b666206e5b153c35286c205eec5df4d2ce0c88cf29ea15df81716794fd75837f6d67dfa4037096cf4bb66f524877a9a0a6bb282c8
 DIST dovecot-2.3.21.1.tar.gz 7842044 BLAKE2B 
3f4238a2f6a73bce1ed37d0def7dc2e61823173836879ed8b4ef5806b4403300335d551215fc4fb2ee8b4106276f84d16b24c2be53148b92da3f946a3b904e46
 SHA512 
9de6ce3a579ef2040248b692874a6d64a732bb735a9cee3144604927cad49690c4b0e29f7ecf3af23190d56f30956d955d13acd5d352534df62fbdfde4b60f9f
-DIST dovecot-2.3.21.tar.gz 7837242 BLAKE2B 
50d0b614e163240e798d272e4435dd51b498bc96468207d2c24132a7f8ac46f5b9393df254d7651046ce10af97d5ca1041b59800b9f71e40b331645d7eaa6326
 SHA512 
2d463c38639c3fd3d617ee5b1a4e4d0c11362339c4d4d62a5a90164a8b10bc58919545679bbf379139bdb743fdb013033abfddc1fc6401eb8099463cdc2401ca

diff --git a/net-mail/dovecot/dovecot-2.3.20-r1.ebuild 
b/net-mail/dovecot/dovecot-2.3.20-r1.ebuild
deleted file mode 100644
index a7ba66d96a56..000000000000
--- a/net-mail/dovecot/dovecot-2.3.20-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.20"
-if [[ ${PV} == *_rc* ]]; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/";
-
-SLOT="0"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc lucene managesieve rpc
-       selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-       app-arch/bzip2
-       app-arch/xz-utils
-       dev-libs/icu:=
-       dev-libs/openssl:0=
-       sys-libs/zlib:=
-       virtual/libiconv
-       argon2? ( dev-libs/libsodium:= )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap:= )
-       lua? ( ${LUA_DEPS} )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lz4? ( app-arch/lz4 )
-       mysql? ( dev-db/mysql-connector-c:0= )
-       pam? ( sys-libs/pam:= )
-       postgres? ( dev-db/postgresql:* )
-       rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       stemmer? ( dev-libs/snowball-stemmer:= )
-       suid? ( acct-group/mail )
-       systemd? ( sys-apps/systemd:= )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       unwind? ( sys-libs/libunwind:= )
-       zstd? ( app-arch/zstd:= )
-       virtual/libcrypt:=
-       "
-
-RDEPEND="
-       ${DEPEND}
-       acct-group/dovecot
-       acct-group/dovenull
-       acct-user/dovecot
-       acct-user/dovenull
-       net-mail/mailbase
-       "
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-       "${FILESDIR}/${PN}"-socket-name-too-long.patch
-       "${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631
-       "${FILESDIR}"/CVE-2022-30550.patch
-       "${FILESDIR}/${PN}"-openssl-3.patch
-)
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-}
-
-src_prepare() {
-       default
-       # bug 657108, 782631
-       #elibtoolize
-       eautoreconf
-
-       # Bug #727244
-       append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no \
-       LUAPC="${ELUA}" \
-       systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-       econf \
-               --with-rundir="${EPREFIX}/run/dovecot" \
-               --with-statedir="${EPREFIX}/var/lib/dovecot" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --disable-rpath \
-               --with-bzlib \
-               --without-libbsd \
-               --with-lzma \
-               --with-icu \
-               --with-ssl \
-               --with-zlib \
-               $( use_with argon2 sodium ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with lua ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with stemmer ) \
-               $( use_with systemd ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with unwind libunwind ) \
-               $( use_with zstd ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="${S}" \
-                       $( use_with ldap ) \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       # bug #340791 and bug #807178
-       local -x NOVALGRIND=true
-
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install() {
-       default
-
-       if use suid; then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Update ssl cert locations
-       sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-       sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-               -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-               "${confd}/10-ssl.conf" || die "failed to update SSL settings in 
10-ssl.conf"
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       # Let's not make a new certificate if we already have one
-       if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-               einfo "Creating SSL     certificate"
-               SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-               install_cert /etc/ssl/dovecot/server
-       fi
-}

diff --git a/net-mail/dovecot/dovecot-2.3.20-r2.ebuild 
b/net-mail/dovecot/dovecot-2.3.20-r2.ebuild
deleted file mode 100644
index 70ed7036f50d..000000000000
--- a/net-mail/dovecot/dovecot-2.3.20-r2.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.20"
-if [[ ${PV} == *_rc* ]]; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/";
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc lucene managesieve rpc
-       selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-       app-arch/bzip2
-       app-arch/xz-utils
-       dev-libs/icu:=
-       dev-libs/openssl:0=
-       sys-libs/zlib:=
-       virtual/libiconv
-       argon2? ( dev-libs/libsodium:= )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap:= )
-       lua? ( ${LUA_DEPS} )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lz4? ( app-arch/lz4 )
-       mysql? ( dev-db/mysql-connector-c:0= )
-       pam? ( sys-libs/pam:= )
-       postgres? ( dev-db/postgresql:* )
-       rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       stemmer? ( dev-libs/snowball-stemmer:= )
-       suid? ( acct-group/mail )
-       systemd? ( sys-apps/systemd:= )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       unwind? ( sys-libs/libunwind:= )
-       zstd? ( app-arch/zstd:= )
-       virtual/libcrypt:=
-       "
-
-RDEPEND="
-       ${DEPEND}
-       acct-group/dovecot
-       acct-group/dovenull
-       acct-user/dovecot
-       acct-user/dovenull
-       net-mail/mailbase
-       "
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-       "${FILESDIR}/${PN}"-socket-name-too-long.patch
-       "${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631
-       "${FILESDIR}"/CVE-2022-30550.patch
-       "${FILESDIR}/${PN}"-openssl-3.patch
-)
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-}
-
-src_prepare() {
-       default
-       # bug 657108, 782631
-       #elibtoolize
-       eautoreconf
-
-       # Bug #727244
-       append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no \
-       LUAPC="${ELUA}" \
-       systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-       econf \
-               --with-rundir="${EPREFIX}/run/dovecot" \
-               --with-statedir="${EPREFIX}/var/lib/dovecot" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --disable-rpath \
-               --with-bzlib \
-               --without-libbsd \
-               --with-lzma \
-               --with-icu \
-               --with-ssl \
-               --with-zlib \
-               $( use_with argon2 sodium ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with lua ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with stemmer ) \
-               $( use_with systemd ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with unwind libunwind ) \
-               $( use_with zstd ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="${S}" \
-                       $( use_with ldap ) \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       # bug #340791 and bug #807178
-       local -x NOVALGRIND=true
-
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install() {
-       default
-
-       if use suid; then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Update ssl cert locations
-       sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-       sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-               -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-               "${confd}/10-ssl.conf" || die "failed to update SSL settings in 
10-ssl.conf"
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       # Let's not make a new certificate if we already have one
-       if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-               einfo "Creating SSL     certificate"
-               SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-               install_cert /etc/ssl/dovecot/server
-       fi
-}

diff --git a/net-mail/dovecot/dovecot-2.3.20-r3.ebuild 
b/net-mail/dovecot/dovecot-2.3.20-r3.ebuild
deleted file mode 100644
index 3d9ad8ac904f..000000000000
--- a/net-mail/dovecot/dovecot-2.3.20-r3.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.20"
-if [[ ${PV} == *_rc* ]]; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/";
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc lucene managesieve rpc
-       selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-       app-arch/bzip2
-       app-arch/xz-utils
-       dev-libs/icu:=
-       dev-libs/openssl:0=
-       sys-libs/zlib:=
-       virtual/libiconv
-       argon2? ( dev-libs/libsodium:= )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap:= )
-       lua? ( ${LUA_DEPS} )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lz4? ( app-arch/lz4 )
-       mysql? ( dev-db/mysql-connector-c:0= )
-       pam? ( sys-libs/pam:= )
-       postgres? ( dev-db/postgresql:* )
-       rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       stemmer? ( dev-libs/snowball-stemmer:= )
-       suid? ( acct-group/mail )
-       systemd? ( sys-apps/systemd:= )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       unwind? ( sys-libs/libunwind:= )
-       zstd? ( app-arch/zstd:= )
-       virtual/libcrypt:=
-       "
-
-RDEPEND="
-       ${DEPEND}
-       acct-group/dovecot
-       acct-group/dovenull
-       acct-user/dovecot
-       acct-user/dovenull
-       net-mail/mailbase[pam?]
-       "
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-       "${FILESDIR}/${PN}"-socket-name-too-long.patch
-       "${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631
-       "${FILESDIR}"/CVE-2022-30550.patch
-       "${FILESDIR}/${PN}"-openssl-3.patch
-)
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-}
-
-src_prepare() {
-       default
-       # bug 657108, 782631
-       #elibtoolize
-       eautoreconf
-
-       # Bug #727244
-       append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no \
-       LUAPC="${ELUA}" \
-       systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-       econf \
-               --with-rundir="${EPREFIX}/run/dovecot" \
-               --with-statedir="${EPREFIX}/var/lib/dovecot" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --disable-rpath \
-               --with-bzlib \
-               --without-libbsd \
-               --with-lzma \
-               --with-icu \
-               --with-ssl \
-               --with-zlib \
-               $( use_with argon2 sodium ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with lua ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with stemmer ) \
-               $( use_with systemd ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with unwind libunwind ) \
-               $( use_with zstd ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="${S}" \
-                       $( use_with ldap ) \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       # bug #340791 and bug #807178
-       local -x NOVALGRIND=true
-
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install() {
-       default
-
-       if use suid; then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Update ssl cert locations
-       sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-       sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-               -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-               "${confd}/10-ssl.conf" || die "failed to update SSL settings in 
10-ssl.conf"
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       # Let's not make a new certificate if we already have one
-       if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-               einfo "Creating SSL     certificate"
-               SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-               install_cert /etc/ssl/dovecot/server
-       fi
-}

diff --git a/net-mail/dovecot/dovecot-2.3.21-r1.ebuild 
b/net-mail/dovecot/dovecot-2.3.21-r1.ebuild
deleted file mode 100644
index 0d5076e6371f..000000000000
--- a/net-mail/dovecot/dovecot-2.3.21-r1.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.21"
-if [[ ${PV} == *_rc* ]]; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/";
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-S="${WORKDIR}/${MY_P}"
-LICENSE="LGPL-2.1 MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc lucene managesieve rpc
-       selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-       app-arch/bzip2
-       app-arch/xz-utils
-       dev-libs/icu:=
-       dev-libs/openssl:0=
-       sys-libs/zlib:=
-       virtual/libiconv
-       argon2? ( dev-libs/libsodium:= )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap:= )
-       lua? ( ${LUA_DEPS} )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lz4? ( app-arch/lz4 )
-       mysql? ( dev-db/mysql-connector-c:0= )
-       pam? ( sys-libs/pam:= )
-       postgres? ( dev-db/postgresql:* )
-       rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       stemmer? ( dev-libs/snowball-stemmer:= )
-       suid? ( acct-group/mail )
-       systemd? ( sys-apps/systemd:= )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       unwind? ( sys-libs/libunwind:= )
-       zstd? ( app-arch/zstd:= )
-       virtual/libcrypt:=
-       "
-
-RDEPEND="
-       ${DEPEND}
-       acct-group/dovecot
-       acct-group/dovenull
-       acct-user/dovecot
-       acct-user/dovenull
-       net-mail/mailbase[pam?]
-       "
-
-PATCHES=(
-       "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-       "${FILESDIR}/${PN}"-socket-name-too-long.patch
-       "${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631
-       "${FILESDIR}"/CVE-2022-30550.patch
-       "${FILESDIR}/${PN}"-openssl-3.patch
-       "${FILESDIR}/${PN}"-typo-push.patch
-)
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-}
-
-src_prepare() {
-       default
-       # bug 657108, 782631
-       #elibtoolize
-       eautoreconf
-
-       # Bug #727244
-       append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no \
-       LUAPC="${ELUA}" \
-       systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-       econf \
-               --with-rundir="${EPREFIX}/run/dovecot" \
-               --with-statedir="${EPREFIX}/var/lib/dovecot" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --disable-rpath \
-               --with-bzlib \
-               --without-libbsd \
-               --with-lzma \
-               --with-icu \
-               --with-ssl \
-               --with-zlib \
-               $( use_with argon2 sodium ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with lua ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with stemmer ) \
-               $( use_with systemd ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with unwind libunwind ) \
-               $( use_with zstd ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="${S}" \
-                       $( use_with ldap ) \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       # bug #340791 and bug #807178
-       local -x NOVALGRIND=true
-
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install() {
-       default
-
-       if use suid; then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Update ssl cert locations
-       sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-       sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-               -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-               "${confd}/10-ssl.conf" || die "failed to update SSL settings in 
10-ssl.conf"
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       # Let's not make a new certificate if we already have one
-       if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-               einfo "Creating SSL     certificate"
-               SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-               install_cert /etc/ssl/dovecot/server
-       fi
-}

diff --git a/net-mail/dovecot/dovecot-2.3.21.ebuild 
b/net-mail/dovecot/dovecot-2.3.21.ebuild
deleted file mode 100644
index 7f3e4ca7441f..000000000000
--- a/net-mail/dovecot/dovecot-2.3.21.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 lua5-3 )
-# do not add a ssl USE flag.  ssl is mandatory
-SSL_DEPS_SKIP=1
-inherit autotools flag-o-matic lua-single ssl-cert systemd toolchain-funcs
-
-MY_P="${P/_/.}"
-#MY_S="${PN}-ce-${PV}"
-major_minor="$(ver_cut 1-2)"
-sieve_version="0.5.21"
-if [[ ${PV} == *_rc* ]]; then
-       rc_dir="rc/"
-else
-       rc_dir=""
-fi
-SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
-       sieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       )
-       managesieve? (
-       
https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
-       ) "
-DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
-HOMEPAGE="https://www.dovecot.org/";
-
-SLOT="0/${PV}"
-LICENSE="LGPL-2.1 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
-
-IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite"
-IUSE_DOVECOT_COMPRESS="lz4 zstd"
-IUSE_DOVECOT_OTHER="argon2 caps doc lucene managesieve rpc
-       selinux sieve solr static-libs stemmer suid systemd tcpd textcat unwind"
-
-IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-DEPEND="
-       app-arch/bzip2
-       app-arch/xz-utils
-       dev-libs/icu:=
-       dev-libs/openssl:0=
-       sys-libs/zlib:=
-       virtual/libiconv
-       argon2? ( dev-libs/libsodium:= )
-       caps? ( sys-libs/libcap )
-       kerberos? ( virtual/krb5 )
-       ldap? ( net-nds/openldap:= )
-       lua? ( ${LUA_DEPS} )
-       lucene? ( >=dev-cpp/clucene-2.3 )
-       lz4? ( app-arch/lz4 )
-       mysql? ( dev-db/mysql-connector-c:0= )
-       pam? ( sys-libs/pam:= )
-       postgres? ( dev-db/postgresql:* )
-       rpc? ( net-libs/libtirpc:= net-libs/rpcsvc-proto )
-       selinux? ( sec-policy/selinux-dovecot )
-       solr? ( net-misc/curl dev-libs/expat )
-       sqlite? ( dev-db/sqlite:* )
-       stemmer? ( dev-libs/snowball-stemmer:= )
-       suid? ( acct-group/mail )
-       systemd? ( sys-apps/systemd:= )
-       tcpd? ( sys-apps/tcp-wrappers )
-       textcat? ( app-text/libexttextcat )
-       unwind? ( sys-libs/libunwind:= )
-       zstd? ( app-arch/zstd:= )
-       virtual/libcrypt:=
-       "
-
-RDEPEND="
-       ${DEPEND}
-       acct-group/dovecot
-       acct-group/dovenull
-       acct-user/dovecot
-       acct-user/dovenull
-       net-mail/mailbase[pam?]
-       "
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-       "${FILESDIR}/${PN}"-autoconf-lua-version-v2.patch
-       "${FILESDIR}/${PN}"-socket-name-too-long.patch
-       "${FILESDIR}/${PN}"-2.3.19.1-slibtool.patch # 782631
-       "${FILESDIR}"/CVE-2022-30550.patch
-       "${FILESDIR}/${PN}"-openssl-3.patch
-)
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-       if use managesieve && ! use sieve; then
-               ewarn "managesieve USE flag selected but sieve USE flag 
unselected"
-               ewarn "sieve USE flag will be turned on"
-       fi
-}
-
-src_prepare() {
-       default
-       # bug 657108, 782631
-       #elibtoolize
-       eautoreconf
-
-       # Bug #727244
-       append-cflags -fasynchronous-unwind-tables
-}
-
-src_configure() {
-       local conf=""
-
-       if use postgres || use mysql || use sqlite; then
-               conf="${conf} --with-sql"
-       fi
-
-       # turn valgrind tests off. Bug #340791
-       VALGRIND=no \
-       LUAPC="${ELUA}" \
-       systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-       econf \
-               --with-rundir="${EPREFIX}/run/dovecot" \
-               --with-statedir="${EPREFIX}/var/lib/dovecot" \
-               --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
-               --disable-rpath \
-               --with-bzlib \
-               --without-libbsd \
-               --with-lzma \
-               --with-icu \
-               --with-ssl \
-               --with-zlib \
-               $( use_with argon2 sodium ) \
-               $( use_with caps libcap ) \
-               $( use_with kerberos gssapi ) \
-               $( use_with lua ) \
-               $( use_with ldap ) \
-               $( use_with lucene ) \
-               $( use_with lz4 ) \
-               $( use_with mysql ) \
-               $( use_with pam ) \
-               $( use_with postgres pgsql ) \
-               $( use_with sqlite ) \
-               $( use_with solr ) \
-               $( use_with stemmer ) \
-               $( use_with systemd ) \
-               $( use_with tcpd libwrap ) \
-               $( use_with textcat ) \
-               $( use_with unwind libunwind ) \
-               $( use_with zstd ) \
-               $( use_enable static-libs static ) \
-               ${conf}
-
-       if use sieve || use managesieve; then
-               # The sieve plugin needs this file to be build to determine the 
plugin
-               # directory and the list of libraries to link to.
-               emake dovecot-config
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               econf \
-                       $( use_enable static-libs static ) \
-                       --localstatedir="${EPREFIX}/var" \
-                       --enable-shared \
-                       --with-dovecot="${S}" \
-                       $( use_with ldap ) \
-                       $( use_with managesieve )
-       fi
-}
-
-src_compile() {
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-       fi
-}
-
-src_test() {
-       # bug #340791 and bug #807178
-       local -x NOVALGRIND=true
-
-       default
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               default
-       fi
-}
-
-src_install() {
-       default
-
-       if use suid; then
-               einfo "Changing perms to allow deliver to be suided"
-               fowners root:mail "/usr/libexec/dovecot/dovecot-lda"
-               fperms 4750 "/usr/libexec/dovecot/dovecot-lda"
-       fi
-
-       newinitd "${FILESDIR}"/dovecot.init-r6 dovecot
-
-       rm -rf "${ED}"/usr/share/doc/dovecot
-
-       dodoc AUTHORS NEWS README TODO
-       dodoc doc/*.{txt,cnf,xml,sh}
-       docinto example-config
-       dodoc doc/example-config/*.{conf,ext}
-       docinto example-config/conf.d
-       dodoc doc/example-config/conf.d/*.{conf,ext}
-       docinto wiki
-       dodoc doc/wiki/*
-       doman doc/man/*.{1,7}
-
-       # Create the dovecot.conf file from the dovecot-example.conf file that
-       # the dovecot folks nicely left for us....
-       local conf="${ED}/etc/dovecot/dovecot.conf"
-       local confd="${ED}/etc/dovecot/conf.d"
-
-       insinto /etc/dovecot
-       doins doc/example-config/*.{conf,ext}
-       insinto /etc/dovecot/conf.d
-       doins doc/example-config/conf.d/*.{conf,ext}
-       fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext
-       rm -f "${confd}/../README"
-
-       # .maildir is the Gentoo default
-       local mail_location="maildir:~/.maildir"
-       sed -i -e \
-               "s|#mail_location =|mail_location = ${mail_location}|" \
-               "${confd}/10-mail.conf" \
-               || die "failed to update mail location settings in 10-mail.conf"
-
-       # We're using pam files (imap and pop3) provided by mailbase
-       if use pam; then
-               sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = 
"\*"|' \
-                       "${confd}/auth-system.conf.ext" \
-                       || die "failed to update PAM settings in 
auth-system.conf.ext"
-               # mailbase does not provide a sieve pam file
-               use managesieve && dosym imap /etc/pam.d/sieve
-               sed -i -e \
-                       's/#!include auth-system.conf.ext/!include 
auth-system.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update PAM settings in 10-auth.conf"
-       fi
-
-       # Update ssl cert locations
-       sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
-               || die "ssl conf failed"
-       sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
-               -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
-               "${confd}/10-ssl.conf" || die "failed to update SSL settings in 
10-ssl.conf"
-
-       # Install SQL configuration
-       if use mysql || use postgres; then
-               sed -i -e \
-                       's/#!include auth-sql.conf.ext/!include 
auth-sql.conf.ext/' \
-                       "${confd}/10-auth.conf" || die "failed to update SQL 
settings in \
-                       10-auth.conf"
-       fi
-
-       # Install LDAP configuration
-       if use ldap; then
-               sed -i -e \
-                       's/#!include auth-ldap.conf.ext/!include 
auth-ldap.conf.ext/' \
-                       "${confd}/10-auth.conf" \
-                       || die "failed to update ldap settings in 10-auth.conf"
-       fi
-
-       if use sieve || use managesieve; then
-               cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || 
die "cd failed"
-               emake DESTDIR="${ED}" install
-               sed -i -e \
-                       's/^[[:space:]]*#mail_plugins = 
$mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
-                       || die "failed to update sieve settings in 15-lda.conf"
-               rm -rf "${ED}"/usr/share/doc/dovecot
-               docinto example-config/conf.d
-               dodoc doc/example-config/conf.d/*.conf
-               insinto /etc/dovecot/conf.d
-               doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
-               use managesieve && doins 
doc/example-config/conf.d/20-managesieve.conf
-               docinto sieve/rfc
-               dodoc doc/rfc/*.txt
-               docinto sieve/devel
-               dodoc doc/devel/DESIGN
-               docinto plugins
-               dodoc doc/plugins/*.txt
-               docinto extensions
-               dodoc doc/extensions/*.txt
-               docinto locations
-               dodoc doc/locations/*.txt
-               doman doc/man/*.{1,7}
-       fi
-
-       use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
-}
-
-pkg_postinst() {
-       # Let's not make a new certificate if we already have one
-       if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
-               -e "${ROOT}"/etc/ssl/dovecot/server.key ]];     then
-               einfo "Creating SSL     certificate"
-               SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
-               install_cert /etc/ssl/dovecot/server
-       fi
-}


Reply via email to