gentoo auto-resync : 27:12:2023 - 01:38:47

5 files changed, 10 insertions, 776 deletions

diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 33c590086603..4381c3c937fd 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -23,22 +23,17 @@ AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c
 AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
-DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca
 DIST courier-imap-5.1.4.tar.bz2 3363196 BLAKE2B 272548fcbc560ebf39e63170702de30970bee1e0026c31e0c8f0a6dcf86271565cda1e83e9fe50174aa2db2f9172cfc78132746ca8eb2e6749f16c7e994d0db9 SHA512 33e54e3b369335f5bc234c638c9bf4f68bc39dc9cb6cc5e3e3ba200f72a7b2fcdca6a4f7e35f32f494406f8757749ccf5204be93ecd2edbfabab4b6316d5957c
 DIST courier-imap-5.1.7.tar.bz2 3364221 BLAKE2B 8a34595879b6ab249db8d90d0a7845b63503c7e9f1ff449e90311fdc086b6a1486fa9ed748d4eba7541265b958ea58514bafd6c90c88cc21f579705e33e5fe55 SHA512 15f64ea78f34d4a3af9f82a8247907324b26a8c550f5e97930548449fc2e9b649d2b5511de063cf3e449843516e681232a3197f2afb40e18be0f36fd8e05e66d
 DIST courier-imap-5.1.8.tar.bz2 3395074 BLAKE2B 1d563d49d61f3ab89297afdc9dd2947280ea5d2d21e0b1e91ec4fa1f54b9385ee41d32b7488236f3492fa41349d7f35c1dc84ee30e07a1752db424391f871db0 SHA512 c939c82e81f8ae98dc52279ee8fffabfee78db7792fdd3bd14ad0e60f7c5bd2c581cffcc3b7f6e2271f250556e9e80713cfcd1834653d59698d51d91435d28f3
 DIST courier-imap-5.2.1.tar.bz2 3411197 BLAKE2B 7b34b523f7c8df3127af6cc7d10ca0bc78638e60d0bc52871d762a4dc28e192b8b64dc1e1a0ee572f11afb4ebd889bfbe426e7520e43caef16d40bdf0224a4bf SHA512 88ce60b666bc1db10059ffd34f76d8275f399ac1833ee820308db25df49ab4914a03547e6d58075d5fecb34204b5fb958877db06b3bb4529eb8cb9e547bbcf63
-DIST courier-imap-5.2.3.tar.bz2 3410307 BLAKE2B d6f9aa02c2367bca898a7322f55a6f178984b0828e16fd4755d221b02384068a54b99c336e3aa4ed247eb04663be041af81803cb27fe6bae6b2f57dfe445f919 SHA512 6df3c12aea6004875c3f1e8dce46b0f199b7e3c881acf79fe6df507022b5e9dcd0cc4ddef6a94bf8763746f4db58f47066731b1f969afcf5f51bed451116af4f
-DIST courier-imap-5.2.4.tar.bz2 3411159 BLAKE2B a26b8b3a6893cfb83ba4d6fa24eb3ac391b200c9642618c48db09d37f40ba8e0409165a8c7b448ab22fe3dd32b613a1a7b5de96860f0e8854a5b037979ea4441 SHA512 db5a53f82b66b2ed99a66f13c97b041e6e275b3ea662b85ce19b0aa13dfeb4e60ec091d608992f52691e3514c3d3429f9249ce5322c5e247fc0058dfef92716b
 DIST courier-imap-5.2.5.tar.bz2 3411629 BLAKE2B 764ac51815777df53b3ce429a4f50ca70f4f2d8b1920f1332691f4ed951939099fa46c0a11301ee0cbcc2471f2f73b7c4dfd8fe5de9389e883552658cd73eea4 SHA512 f7864bc7c23ee08ab8c90b3d83e577c62c468f96b2481e909dc0eb5aab6c6ef141e164742458776dd1106e50d8752e6e8102971a4e3d75d6a108dd72fcae0de4
+DIST courier-imap-5.2.6.tar.bz2 3411210 BLAKE2B 6176fdc29456d245e819bd7662fc63aabc7271fcd2de3af21f2cf380eb7b62486442aa70274155197660a9ab19aa629725b99c107c77693182d41e7a363c1b14 SHA512 ee48ea5a5e043c3ce13027af2815ca07a1cba7d0ca328f8120ccc7f6134d18c610db202b2820c1dd589a427c1a3d096283c2f3fe9f9bd4815c9586dbe779d904
 EBUILD courier-imap-5.1.2-r1.ebuild 7055 BLAKE2B 490ff0c972159bee1718f0a8f3c51fb0a2789b2f488f9344045950c3d20f908164947c68bada94196972c2cd8b7eb3f9a24a91630646e803fb53d359aeebff1d SHA512 86e7d1a28d6a37dc22471b9c965188f61b4b99ab8e1981f27c4cedb02ce3dbbbb4d8a4d3cfb1ce961a2f9cdc4b4e4c9195bc27651651e889c81f3a93b44f3c0d
-EBUILD courier-imap-5.1.3-r1.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46cccf01853ab7fac27dcd0c5895d5275a61de53350a6b7961739eae42d007fe811b1eecf66e07b955734f46f0d8afff1835 SHA512 e0538948fb23aecc78e5d62f3ec86344e42e751577aac6443f0e556a326a04e51c0ac6b53ce154f0ba53c019f46be3726f13b5b9a7c5576c6c5d07149d588ecf
 EBUILD courier-imap-5.1.4.ebuild 7056 BLAKE2B 56a06f662daa0b4e45c0ed755c536a2f29f5168cfc84fe62db809de2865cbb4c3e74c2104034d9dce707d9e405c09f4c8523cbd163f7a96adf9669c27446ec3e SHA512 381c68368c66c33f7a0f709ac0b3ab430e5b10b57c0bc12ac6943969c7bb3dca1780bc423437316203fc9ac0d7ab50ae7906ac50cba0fa9302a4d17704c2eb7f
 EBUILD courier-imap-5.1.7.ebuild 7062 BLAKE2B 65a4b28c409357713d9f7a3b337e46cccf01853ab7fac27dcd0c5895d5275a61de53350a6b7961739eae42d007fe811b1eecf66e07b955734f46f0d8afff1835 SHA512 e0538948fb23aecc78e5d62f3ec86344e42e751577aac6443f0e556a326a04e51c0ac6b53ce154f0ba53c019f46be3726f13b5b9a7c5576c6c5d07149d588ecf
 EBUILD courier-imap-5.1.8.ebuild 7070 BLAKE2B dd69c32c0842f300301ff00e8b5da9f448c0197a8fa86301f8847ee27dae131d75a90a3facf4180b4564dbe4147e21caf13b3e7b9617fe4f0f4c0d298ede20ce SHA512 324e24e982e846ac4562ffc5952968cc81e7f644452086f08790aaa4529b79467140b29981fd4ab8686a904d8cec3447fcc0b0a18e7b6edeaeadfa4988c9a568
-EBUILD courier-imap-5.2.1-r2.ebuild 7011 BLAKE2B e26d3e3539b36fe6b38fb03e2887201b0a513cdb6fce4d2f3d09eb0013d3cbc4899f83b87e6a7e078d51ac9e0a16b5c35c2c1015a1979c39eaa5e4f482755c5c SHA512 3c2fb9fcf3be39e555387eea20539cf13635934c7cb7ee3708e225c97f46a6bf76d4028e41edeefd94f7875410ed0d797873a4322f9d163a06dbde6d17a4549b
 EBUILD courier-imap-5.2.1.ebuild 7070 BLAKE2B dd69c32c0842f300301ff00e8b5da9f448c0197a8fa86301f8847ee27dae131d75a90a3facf4180b4564dbe4147e21caf13b3e7b9617fe4f0f4c0d298ede20ce SHA512 324e24e982e846ac4562ffc5952968cc81e7f644452086f08790aaa4529b79467140b29981fd4ab8686a904d8cec3447fcc0b0a18e7b6edeaeadfa4988c9a568
-EBUILD courier-imap-5.2.3.ebuild 7018 BLAKE2B d7e465c4c82484697fd8abb743c5fa2f72490a8d3cbaaff52ad76e0417db9515c223a0d32660d831064339479a29297ed738b188bcfa9a6a5db2cf4015833f26 SHA512 e30cb82c215fc83d0450e882388436de4f52d44cf6315d16b685b3ef6640d6bcb7892702dab0ebeddfd60b0555a6b50a3d7dc29e05704d0ff60e479745ee58d3
-EBUILD courier-imap-5.2.4.ebuild 7038 BLAKE2B 5f9dca20c3d3f8280d961c80dce418641bf97a0109f03ed5b7e58e032b28309b98656227c7304a120ba2f35962b0df6a58d0e2eae0266d890d3da74ff7f0f988 SHA512 9c583b5fde0477dab60167312cea66f65b191dc38fe69b77be656fc4ccea9fa22221f488685777e20aa116a1303e250c5582449912c90cd980ef02056953f1d0
 EBUILD courier-imap-5.2.5-r1.ebuild 6527 BLAKE2B 142073b33df4dd31f47decb0fce313f7b3c23ed0e54e7eb0d55beb5a2e274d1035689e1fe4ff9321abc5183db1c14dfda07f9feae481a4fc8a74815a9d922c76 SHA512 904b99d7136bb49669165f41ee54e4dc3e212648de20e032e71d4c7584a79cfec6257970869f2dc2d952de21b921a3ff5c19c00de643b280eda0904d90064971
+EBUILD courier-imap-5.2.6.ebuild 6527 BLAKE2B 142073b33df4dd31f47decb0fce313f7b3c23ed0e54e7eb0d55beb5a2e274d1035689e1fe4ff9321abc5183db1c14dfda07f9feae481a4fc8a74815a9d922c76 SHA512 904b99d7136bb49669165f41ee54e4dc3e212648de20e032e71d4c7584a79cfec6257970869f2dc2d952de21b921a3ff5c19c00de643b280eda0904d90064971
 MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950
diff --git a/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild b/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild
deleted file mode 100644
index d551f9d82941..000000000000
--- a/net-mail/courier-imap/courier-imap-5.1.3-r1.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/imap/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls:=[tools] )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=net-libs/courier-authlib-0.71
-	>=net-libs/courier-unicode-2:=
-	>=net-mail/mailbase-0.00-r8
-	net-dns/libidn:=
-	berkdb? ( sys-libs/db:= )
-	fam? ( virtual/fam )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	!mail-mta/courier
-	sys-process/procps
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )
-"
-
-# get rid of old style virtual - bug 350792
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/cyrus-imapd
-"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-# make check is not supported by this package due to the
-# --enable-workarounds-for-imap-client-bugs option.
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
-and remove TLS_DHPARAMS from configuration files or run mkdhparams
-
-For a quick-start howto please refer to
-${PN}-gentoo.readme in /usr/share/doc/${PF}
-
-Please convert maildir to utf8
-and rerun mkdhparams if needed. Location has changed
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.17-aclocal-fix.patch"
-	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
-)
-
-src_prepare() {
-	default
-
-	# These patches should fix problems detecting BerkeleyDB.
-	# We now can compile with db4 support.
-	if use berkdb ; then
-		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
-		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	# Default to gdbm if both berkdb and gdbm are present.
-	if use gdbm ; then
-		einfo "Building with GDBM support"
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB support"
-		myconf="${myconf} --with-db=db"
-	fi
-
-	if use trashquota ; then
-		einfo "Building with Trash Quota Support"
-		myconf="${myconf} --with-trashquota"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	econf \
-		--with-notice=unicode \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--sysconfdir="/etc/${PN}" \
-		--libexecdir="/usr/$(get_libdir)/${PN}" \
-		--localstatedir="/var/lib/${PN}" \
-		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-certsdir="/etc/courier-imap" \
-		$(use_with fam) \
-		$(use_with ipv6) \
-		$(use_with gnutls) \
-		${myconf}
-}
-
-#src_compile() {
-	# spurious failures with parallel compiles, bug #????
-#	emake -j1
-#}
-
-src_install() {
-	dodir "/var/lib/${PN}" /etc/pam.d
-	keepdir /var/lib/courier-imap
-
-	default
-	rm -r "${D}/etc/pam.d" || die
-
-	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
-	for name in imapd pop3d ; do
-		mv "${D}/usr/sbin/"{,courier-}${name} \
-			|| die "failed to rename ${name} to courier-${name}"
-	done
-
-	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		sed -e 's/Maildir/${MAILDIR}/' \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-	done
-
-	# Rename the config files correctly and add a value for ${MAILDIR}
-	# to them.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		mv "${D}/etc/${PN}/${service}"{.dist,} \
-			|| die "failed to rename ${service}.dist to ${service}"
-		echo -e '\n# Hardwire a value for ${MAILDIR}' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for service in imapd pop3d ; do
-		echo -e '# Put any program for ${PRERUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
-		echo -e '# Put any program for ${LOGINRUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo -e '# this is for relay-ctrl-allow in 4*' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for x in "${D}/usr/sbin"/* ; do
-		if [[ -L "${x}" ]] ; then
-			rm "${x}" || die "failed to remove ${x}"
-		fi
-	done
-
-	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
-	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
-
-	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
-
-	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
-
-	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
-
-	for initd in courier-{imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
-			> "${T}/${initd}" \
-			|| die "initd libdir-sed failed"
-		doinitd "${T}/${initd}"
-	done
-
-	cp "${FILESDIR}"/courier-*-r1.service .
-
-	sed -i \
-		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		courier-*-r1.service \
-		|| die
-
-	systemd_newunit courier-authdaemond-r1.service \
-					courier-authdaemond.service
-	systemd_newunit courier-imapd-ssl-r1.service \
-					courier-imapd-ssl.service
-	systemd_newunit courier-imapd-r1.service \
-					courier-imapd.service
-
-	exeinto "/usr/$(get_libdir)/${PN}"
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
-			> "${T}/${exe}" \
-			|| die "exe libdir-sed failed"
-		doexe "${T}/${exe}"
-	done
-
-	# Avoid a collision with mail-mta/netqmail, bug 482098.
-	mv "${D}/usr/sbin/"{,courier-}maildirmake \
-		|| die "failed to rename maildirmake to courier-maildirmake"
-	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
-		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-	readme.gentoo_create_doc
-	dodoc "${FILESDIR}/${PN}-gentoo.readme"
-	docinto imap
-	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
-	docinto rfc2045
-	dodoc libs/rfc2045/*.html
-	docinto tcpd
-	dodoc libs/tcpd/README* libs/tcpd/*.html
-	exeinto /etc/cron.monthly
-	newexe "${FILESDIR}"/${PN}.cron ${PN}
-}
-
-pkg_postinst() {
-	# Some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
-
-	readme.gentoo_print_elog
-
-	elog ""
-	elog "Courier Imap now run as user mail:mail."
-	elog ""
-	elog "This require you to enable read/write access to the caches:"
-	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
-	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
-}
diff --git a/net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild b/net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild
deleted file mode 100644
index 403ebd030787..000000000000
--- a/net-mail/courier-imap/courier-imap-5.2.1-r2.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/imap/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="berkdb debug +gdbm gnutls ipv6 selinux trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls:=[tools] )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=net-libs/courier-authlib-0.71
-	>=net-libs/courier-unicode-2:=
-	>=net-mail/mailbase-0.00-r8
-	net-dns/libidn:=
-	net-mail/courier-makedat[berkdb?,gdbm?]
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	!mail-mta/courier
-	sys-process/procps
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )
-"
-
-# get rid of old style virtual - bug 350792
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/cyrus-imapd
-"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-# make check is not supported by this package due to the
-# --enable-workarounds-for-imap-client-bugs option.
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
-and remove TLS_DHPARAMS from configuration files or run mkdhparams
-
-For a quick-start howto please refer to
-${PN}-gentoo.readme in /usr/share/doc/${PF}
-
-Please convert maildir to utf8
-and rerun mkdhparams if needed. Location has changed
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.8-aclocal-fix.patch"
-	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
-	"${FILESDIR}/${P}-makedat.patch"
-)
-
-src_prepare() {
-	default
-
-	# These patches should fix problems detecting BerkeleyDB.
-	# We now can compile with db4 support.
-	if use berkdb ; then
-		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
-		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	# Default to gdbm if both berkdb and gdbm are present.
-	if use gdbm ; then
-		einfo "Building with GDBM support"
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB support"
-		myconf="${myconf} --with-db=db"
-	fi
-
-	if use trashquota ; then
-		einfo "Building with Trash Quota Support"
-		myconf="${myconf} --with-trashquota"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	econf \
-		--with-notice=unicode \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--sysconfdir="/etc/${PN}" \
-		--libexecdir="/usr/$(get_libdir)/${PN}" \
-		--localstatedir="/var/lib/${PN}" \
-		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-certsdir="/etc/courier-imap" \
-		$(use_with ipv6) \
-		$(use_with gnutls) \
-		${myconf}
-}
-
-src_install() {
-	dodir "/var/lib/${PN}" /etc/pam.d
-	keepdir /var/lib/courier-imap
-
-	default
-	rm -r "${D}/etc/pam.d" || die
-
-	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
-	for name in imapd pop3d ; do
-		mv "${D}/usr/sbin/"{,courier-}${name} \
-			|| die "failed to rename ${name} to courier-${name}"
-	done
-
-	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		sed -e 's/Maildir/${MAILDIR}/' \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-	done
-
-	# Rename the config files correctly and add a value for ${MAILDIR}
-	# to them.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		mv "${D}/etc/${PN}/${service}"{.dist,} \
-			|| die "failed to rename ${service}.dist to ${service}"
-		echo -e '\n# Hardwire a value for ${MAILDIR}' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for service in imapd pop3d ; do
-		echo -e '# Put any program for ${PRERUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
-		echo -e '# Put any program for ${LOGINRUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo -e '# this is for relay-ctrl-allow in 4*' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for x in "${D}/usr/sbin"/* ; do
-		if [[ -L "${x}" ]] ; then
-			rm "${x}" || die "failed to remove ${x}"
-		fi
-	done
-
-	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
-	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
-
-	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
-
-	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
-
-	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
-
-	for initd in courier-{imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
-			> "${T}/${initd}" \
-			|| die "initd libdir-sed failed"
-		doinitd "${T}/${initd}"
-	done
-
-	cp "${FILESDIR}"/courier-*-r1.service .
-
-	sed -i \
-		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		courier-*-r1.service \
-		|| die
-
-	systemd_newunit courier-authdaemond-r1.service \
-					courier-authdaemond.service
-	systemd_newunit courier-imapd-ssl-r1.service \
-					courier-imapd-ssl.service
-	systemd_newunit courier-imapd-r1.service \
-					courier-imapd.service
-
-	exeinto "/usr/$(get_libdir)/${PN}"
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
-			> "${T}/${exe}" \
-			|| die "exe libdir-sed failed"
-		doexe "${T}/${exe}"
-	done
-
-	# Avoid a collision with mail-mta/netqmail, bug 482098.
-	mv "${D}/usr/sbin/"{,courier-}maildirmake \
-		|| die "failed to rename maildirmake to courier-maildirmake"
-	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
-		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-	readme.gentoo_create_doc
-	dodoc "${FILESDIR}/${PN}-gentoo.readme"
-	docinto imap
-	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
-	docinto rfc2045
-	dodoc libs/rfc2045/*.html
-	docinto tcpd
-	dodoc libs/tcpd/README* libs/tcpd/*.html
-	exeinto /etc/cron.monthly
-	newexe "${FILESDIR}"/${PN}.cron ${PN}
-}
-
-pkg_postinst() {
-	# Some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
-
-	readme.gentoo_print_elog
-
-	elog ""
-	elog "Courier Imap now run as user mail:mail."
-	elog ""
-	elog "This require you to enable read/write access to the caches:"
-	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
-	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
-}
diff --git a/net-mail/courier-imap/courier-imap-5.2.3.ebuild b/net-mail/courier-imap/courier-imap-5.2.3.ebuild
deleted file mode 100644
index e39ba1873b3e..000000000000
--- a/net-mail/courier-imap/courier-imap-5.2.3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit autotools readme.gentoo-r1 systemd
-
-DESCRIPTION="An IMAP daemon designed specifically for maildirs"
-HOMEPAGE="https://www.courier-mta.org/imap/"
-SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-IUSE="berkdb debug +gdbm gnutls ipv6 selinux trashquota"
-REQUIRED_USE="|| ( berkdb gdbm )"
-
-CDEPEND="
-	gnutls? ( net-libs/gnutls:=[tools] )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	>=net-libs/courier-authlib-0.71
-	>=net-libs/courier-unicode-2:=
-	>=net-mail/mailbase-0.00-r8
-	net-dns/libidn:=
-	net-mail/courier-makedat[berkdb?,gdbm?]
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	!mail-mta/courier
-	sys-process/procps
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )
-"
-
-# get rid of old style virtual - bug 350792
-RDEPEND="${RDEPEND}
-	!mail-mta/courier
-	!net-mail/cyrus-imapd
-"
-
-RC_VER="4.0.6-r1"
-INITD_VER="4.0.6-r1"
-
-# make check is not supported by this package due to the
-# --enable-workarounds-for-imap-client-bugs option.
-RESTRICT="test"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading
-and remove TLS_DHPARAMS from configuration files or run mkdhparams
-
-For a quick-start howto please refer to
-${PN}-gentoo.readme in /usr/share/doc/${PF}
-
-Please convert maildir to utf8
-and rerun mkdhparams if needed. Location has changed
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.1.8-aclocal-fix.patch"
-	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
-	"${FILESDIR}/${PN}-5.2.1-makedat.patch"
-)
-
-src_prepare() {
-	default
-
-	# These patches should fix problems detecting BerkeleyDB.
-	# We now can compile with db4 support.
-	if use berkdb ; then
-		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
-		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=""
-
-	# Default to gdbm if both berkdb and gdbm are present.
-	if use gdbm ; then
-		einfo "Building with GDBM support"
-		myconf="${myconf} --with-db=gdbm"
-	elif use berkdb ; then
-		einfo "Building with BerkeleyDB support"
-		myconf="${myconf} --with-db=db"
-	fi
-
-	if use trashquota ; then
-		einfo "Building with Trash Quota Support"
-		myconf="${myconf} --with-trashquota"
-	fi
-
-	use debug && myconf="${myconf} debug=true"
-
-	econf \
-		--with-notice=unicode \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--sysconfdir="/etc/${PN}" \
-		--libexecdir="/usr/$(get_libdir)/${PN}" \
-		--localstatedir="/var/lib/${PN}" \
-		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
-		--enable-workarounds-for-imap-client-bugs \
-		--with-mailuser=mail \
-		--with-mailgroup=mail \
-		--with-certsdir="/etc/courier-imap" \
-		$(use_with ipv6) \
-		$(use_with gnutls) \
-		${myconf}
-}
-
-src_install() {
-	dodir "/var/lib/${PN}" /etc/pam.d
-	keepdir /var/lib/courier-imap
-
-	default
-	rm -r "${D}/etc/pam.d" || die
-
-	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
-	for name in imapd pop3d ; do
-		mv "${D}/usr/sbin/"{,courier-}${name} \
-			|| die "failed to rename ${name} to courier-${name}"
-	done
-
-	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
-	# 'Maildir', and to use /usr/sbin/courier-foo names.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		sed -e 's/Maildir/${MAILDIR}/' \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-		sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \
-			-i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \
-			|| die "sed failed"
-	done
-
-	# Rename the config files correctly and add a value for ${MAILDIR}
-	# to them.
-	for service in {imapd,pop3d}{,-ssl} ; do
-		mv "${D}/etc/${PN}/${service}"{.dist,} \
-			|| die "failed to rename ${service}.dist to ${service}"
-		echo -e '\n# Hardwire a value for ${MAILDIR}' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}"
-		echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for service in imapd pop3d ; do
-		echo -e '# Put any program for ${PRERUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'PRERUN=' >> "${D}/etc/${PN}/${service}"
-		echo -e '# Put any program for ${LOGINRUN} here' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo -e '# this is for relay-ctrl-allow in 4*' \
-			 >> "${D}/etc/${PN}/${service}"
-		echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}"
-	done
-
-	for x in "${D}/usr/sbin"/* ; do
-		if [[ -L "${x}" ]] ; then
-			rm "${x}" || die "failed to remove ${x}"
-		fi
-	done
-
-	mv "${D}/usr/share"/* "${D}/usr/sbin/" || die
-	mv "${D}/usr/sbin/man" "${D}/usr/share/" || die
-
-	rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die
-
-	dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
-
-	dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
-
-	for initd in courier-{imapd,pop3d}{,-ssl} ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \
-			> "${T}/${initd}" \
-			|| die "initd libdir-sed failed"
-		doinitd "${T}/${initd}"
-	done
-
-	cp "${FILESDIR}"/courier-*-r1.service .
-
-	sed -i \
-		-e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		courier-*-r1.service \
-		|| die
-
-	systemd_newunit courier-authdaemond-r1.service \
-					courier-authdaemond.service
-	systemd_newunit courier-imapd-ssl-r1.service \
-					courier-imapd-ssl.service
-	systemd_newunit courier-imapd-r1.service \
-					courier-imapd.service
-
-	exeinto "/usr/$(get_libdir)/${PN}"
-	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
-		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \
-			"${FILESDIR}/${PN}-${RC_VER}-${exe}" \
-			> "${T}/${exe}" \
-			|| die "exe libdir-sed failed"
-		doexe "${T}/${exe}"
-	done
-
-	# Avoid a collision with mail-mta/netqmail, bug 482098.
-	mv "${D}/usr/sbin/"{,courier-}maildirmake \
-		|| die "failed to rename maildirmake to courier-maildirmake"
-	mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \
-		|| die "failed to rename maildirmake.1 to courier-maildirmake.1"
-
-	dodoc AUTHORS INSTALL NEWS README ChangeLog
-	readme.gentoo_create_doc
-	dodoc "${FILESDIR}/${PN}-gentoo.readme"
-	docinto imap
-	dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README*
-	docinto maildir
-	dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README*
-	docinto rfc2045
-	dodoc libs/rfc2045/*.html
-	docinto tcpd
-	dodoc libs/tcpd/README* libs/tcpd/*.html
-	exeinto /etc/cron.monthly
-	newexe "${FILESDIR}"/${PN}.cron ${PN}
-}
-
-pkg_postinst() {
-	# Some users have been reporting that permissions on this directory were
-	# getting scrambled, so let's ensure that they are sane.
-	fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}"
-
-	readme.gentoo_print_elog
-
-	elog ""
-	elog "Courier Imap now run as user mail:mail."
-	elog ""
-	elog "This require you to enable read/write access to the caches:"
-	elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)"
-	elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )"
-}
diff --git a/net-mail/courier-imap/courier-imap-5.2.4.ebuild b/net-mail/courier-imap/courier-imap-5.2.6.ebuild
index a8cd065732f6..e166a72b840a 100644
--- a/net-mail/courier-imap/courier-imap-5.2.4.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.2.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit autotools readme.gentoo-r1 systemd
+inherit readme.gentoo-r1 systemd
 
 DESCRIPTION="An IMAP daemon designed specifically for maildirs"
 HOMEPAGE="https://www.courier-mta.org/imap/"
@@ -20,27 +20,26 @@ CDEPEND="
 	!gnutls? (
 		dev-libs/openssl:0=
 	)
-	>=net-libs/courier-authlib-0.71
-	>=net-libs/courier-unicode-2:=
-	>=net-mail/mailbase-0.00-r8
+	net-libs/courier-authlib
+	net-libs/courier-unicode
+	net-mail/mailbase
 	net-dns/libidn:=
-	net-mail/courier-common[berkdb?,gdbm?]
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.0:= )
+	gdbm? ( sys-libs/gdbm:= )
+	!mail-mta/courier
 "
 DEPEND="${CDEPEND}
 	dev-lang/perl
-	!mail-mta/courier
 	sys-process/procps
 "
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-courier )
 "
 
-# get rid of old style virtual - bug 350792
 RDEPEND="${RDEPEND}
-	!mail-mta/courier
 	!net-mail/cyrus-imapd
+	!net-mail/courier-common
+	!net-mail/courier-makedat
 "
 
 RC_VER="4.0.6-r1"
@@ -65,22 +64,8 @@ and rerun mkdhparams if needed. Location has changed
 PATCHES=(
 	"${FILESDIR}/${PN}-5.1.8-aclocal-fix.patch"
 	"${FILESDIR}/${PN}-5.0.8-ar-fix.patch"
-	"${FILESDIR}/${P}-common.patch"
 )
 
-src_prepare() {
-	default
-
-	# These patches should fix problems detecting BerkeleyDB.
-	# We now can compile with db4 support.
-	if use berkdb ; then
-		eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch"
-		eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch"
-	fi
-
-	eautoreconf
-}
-
 src_configure() {
 	local myconf=""
 
@@ -98,8 +83,6 @@ src_configure() {
 		myconf="${myconf} --with-trashquota"
 	fi
 
-	use debug && myconf="${myconf} debug=true"
-
 	econf \
 		--with-notice=unicode \
 		--disable-root-check \
@@ -107,7 +90,6 @@ src_configure() {
 		--sysconfdir="/etc/${PN}" \
 		--libexecdir="/usr/$(get_libdir)/${PN}" \
 		--localstatedir="/var/lib/${PN}" \
-		--with-authdaemonvar="/var/lib/${PN}/authdaemon" \
 		--enable-workarounds-for-imap-client-bugs \
 		--with-mailuser=mail \
 		--with-mailgroup=mail \