diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index 12430b9f2577..ebe593301684 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,2 +1 @@
-DIST courier-imap-5.2.10.tar.bz2 3415819 BLAKE2B 61728277e1c30e8487ab99370df8800954071a54e00bc1b73f5633060c14378633e94ea43334fcd4f6763a1adef26a4d19cc96db32ca3d089a8fd85b0a9e899b SHA512 4dd899127e37fc99dc7cacec824e0f922ce0e0c3cff0aaccc818ea6a903a991517b6d98a2c350125f3cad57fe0dc79dc13704fce3874d869158ea7a868cae180
 DIST courier-imap-5.2.11.tar.bz2 3418726 BLAKE2B 3acd70848f7946c2ab4b4078d2d20fea2033c13270a4701fa6d2bf54c26a3c6552e6b5877ab095db38e49a6f5c1aa9c2b61bf948d6540a724b4466b979830ea1 SHA512 8588088a55346bb3db6823b5a4680b3fe54dc05d055e7040f36f355b2c77537a97be1d392ad12006a132b0c5960f04a07b9c19f4cd74f4be989210215978e608
diff --git a/net-mail/courier-imap/courier-imap-5.2.10-r1.ebuild b/net-mail/courier-imap/courier-imap-5.2.10-r1.ebuild
deleted file mode 100644
index 478efcd70eac..000000000000
--- a/net-mail/courier-imap/courier-imap-5.2.10-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2025 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="https://sourceforge.net/projects/courier/files/imap/${PV}/${P}.tar.bz2/download
-	-> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~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
-	<net-libs/courier-unicode-2.4:=
-	net-mail/mailbase
-	net-dns/libidn:=
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm:= )
-	!mail-mta/courier
-"
-DEPEND="${CDEPEND}
-	dev-lang/perl
-	sys-process/procps
-	net-mail/courier-common
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-courier )
-"
-
-RDEPEND="${RDEPEND}
-	!net-mail/cyrus-imapd
-	!net-mail/courier-makedat
-"
-
-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}-gcc15.patch"
-)
-
-src_prepare() {
-	default
-	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
-
-	econf \
-		--with-notice=unicode \
-		--disable-root-check \
-		--bindir=/usr/sbin \
-		--sysconfdir="/etc/${PN}" \
-		--libexecdir="/usr/$(get_libdir)/${PN}" \
-		--localstatedir="/var/lib/${PN}" \
-		--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
-
-	#  Moved to courier-common
-	rm "${D}"/usr/sbin/deliverquota || die
-	rm "${D}"/usr/sbin/maildirkw || die
-	rm "${D}"/usr/sbin/makedat || die
-	rm "${D}"/usr/share/man/man1/maildirkw.1 || die
-	rm "${D}"/usr/share/man/man8/deliverquota.8 || die
-
-	# 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"
-
-	rm -rf "${D}"/usr/sbin/doc
-
-	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.
-	chmod 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/files/courier-imap-5.2.10-gcc15.patch b/net-mail/courier-imap/files/courier-imap-5.2.10-gcc15.patch
deleted file mode 100644
index 01beff418618..000000000000
--- a/net-mail/courier-imap/files/courier-imap-5.2.10-gcc15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/libs/tcpd/starttls.c	2024-11-26 08:53:04.567473386 +0100
-+++ b/libs/tcpd/starttls.c	2024-11-26 08:53:25.764198066 +0100
-@@ -522,8 +522,9 @@
- 	return (1);
- }
- 
--static void child_handler()
-+static void child_handler(int signum)
- {
-+        (void)signum;
- 	alarm(10);
- }
- 
---- a/libs/tcpd/tcpd.c	2024-11-26 08:54:56.315021691 +0100
-+++ b/libs/tcpd/tcpd.c	2024-11-26 08:55:12.192818500 +0100
-@@ -1590,7 +1590,7 @@
- 
- 	if (p == 0)
- 	{
--		wait_restore(childsig);
-+		wait_restore();
- 
- 		if (accesslocal) /* Lookup local interface address too? */
- 		{