5 files changed, 2 insertions, 247 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index aa908abd82e4..40417a2c0f42 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index d90ecc014330..c60719a687b7 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -23,8 +23,6 @@ AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71
 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078
 DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d
 DIST courier-imap-5.2.10.tar.bz2 3415819 BLAKE2B 61728277e1c30e8487ab99370df8800954071a54e00bc1b73f5633060c14378633e94ea43334fcd4f6763a1adef26a4d19cc96db32ca3d089a8fd85b0a9e899b SHA512 4dd899127e37fc99dc7cacec824e0f922ce0e0c3cff0aaccc818ea6a903a991517b6d98a2c350125f3cad57fe0dc79dc13704fce3874d869158ea7a868cae180
-DIST courier-imap-5.2.6.tar.bz2 3411210 BLAKE2B 6176fdc29456d245e819bd7662fc63aabc7271fcd2de3af21f2cf380eb7b62486442aa70274155197660a9ab19aa629725b99c107c77693182d41e7a363c1b14 SHA512 ee48ea5a5e043c3ce13027af2815ca07a1cba7d0ca328f8120ccc7f6134d18c610db202b2820c1dd589a427c1a3d096283c2f3fe9f9bd4815c9586dbe779d904
 EBUILD courier-imap-5.1.2-r1.ebuild 7062 BLAKE2B 70fc07815a8765b8cd5b879001d938dcd76efa9178509024f119efff09dd0a41267b74a6d4971b5f4f7f136702dd92768b293314566cec8cbe38f2f4c2ae3718 SHA512 1a97d233846434c217e97004c0619c7ee02e7eb253b2b461b6f130aa21261d68ca9ebd513983bd6e4886b34c7fc07fc78dc72608619f300405b15d09fdaf1806
 EBUILD courier-imap-5.2.10.ebuild 6891 BLAKE2B 167564aec54cc136fd9eaf8fe0225aabffa80774927b420e991f6cf95f154751cc946b8a310b6cd6d88eade5eaed500bddb5e18dc5f45e13821ca798a3367bee SHA512 978a2e1bd0f502257cd94ef5a17237e6232c1e426205959137ac1087875adce9c33ee56d19ba6e039b6c771ae1311fd0ebc575ea4a2a1ecef072c01a2a884d09
-EBUILD courier-imap-5.2.6-r1.ebuild 6859 BLAKE2B 8f24a988564a9125ec237c210354c6bdda33ab4e1727eb6ad883ee7311c6c0612d99428e30f73a7af43b5f1cdf698b2be34bb7090aad5c50230b9e3a0697d9f5 SHA512 62b3e7583d02372dd4c2b9bcdd5c94151ed25a60640105b5bd0c1894a71500994271d9b05fce94be5029dc406dd563c1f591ce707dba7f607713a242b222bf27
 MISC metadata.xml 463 BLAKE2B 548ad09a1ed2b0c44cbb80ab66b653185b178873ae88f5a33545b759914fcb9e6491eef7c9e6da0a713f40c92b3b084cb36dec6f411ca8cba6db76767c8ca237 SHA512 d1aaf82b4ce4775d8e8f97f8900e10aaf403b1224744263d76c3eb890e0ec08c8e108b2f631498bd21ae3551c211747374526d73dd9764c01c4e6af5de78b950
diff --git a/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild b/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild
deleted file mode 100644
index ab09b6974347..000000000000
--- a/net-mail/courier-imap/courier-imap-5.2.6-r1.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2024 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://downloads.sourceforge.net/courier/${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
-	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}/${PN}-5.2.10-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/notmuch/Manifest b/net-mail/notmuch/Manifest
index 11022f3d7f73..422a960f2721 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -4,5 +4,5 @@ DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b404677
 DIST notmuch-0.38.3.tar.xz 805416 BLAKE2B 08f4f5c5732a788a52ca5fb6e6296d7348586796f86cab8273aebf88521e52c52b4515287334d246d030bf3ba0666f24bf0badad843e8b20a1a8bc1da32f6509 SHA512 247f8b365a75b29df719403bc2c9645eb669a7ee6eb4c1e0047dcf55fea4d66c8dcb4899162b952643aa6148ec6e1538ebe3e7e8408376153165e394084aed19
 DIST notmuch-0.39.tar.xz 811448 BLAKE2B 5d9a6fb28f17c45a8310f83c3ae70e63a5263b85565cfebae96f3054cb0b682164fced83d31176a6287cf9e18570dbeb114f50bc2cd4c0db41e744b8d7d1d15d SHA512 a9864a6a8423c723d36df269dcc73c2987be63c6e328b818235d0604cb594e0e91ee7639ee99a4b867be4387a605abc187a3b458aa7b0e4fc3a1744c0c2daa69
 EBUILD notmuch-0.38.3.ebuild 7098 BLAKE2B 9b14cb27c58951d39d2c25259a7dc18d2e52a0ef16d301f6d3208b81ea975284417c53dc684f2b870562f9269ca3473dd2ef4d5a391d588ec65e3d2142092698 SHA512 e0374e2b24ebed10fcd5f49569edb58f292c095be962dcc45ff6d6acd9def215b0ac6bc83ad44b8e22234af182109dd1f34c016adc8121d1df2c9bc3b6ade995
-EBUILD notmuch-0.39.ebuild 5936 BLAKE2B 4de4acc7c29cc9c7543776f829fc3e692038c1e4ba243d913f873c00eeed0de62def8700c96225e3b65feebb7e538b3632933a2d88413c594e5ad350a2209fc1 SHA512 0484317770acab28403fb795d79f69eb66a3ab87de874ee0e0f65b7ddc72b3e729bab3d026a8fe9560173e2fcad0505a94051a0e1086f0f6f77caf4741586cd2
+EBUILD notmuch-0.39.ebuild 5935 BLAKE2B e3ab91aba8ac51c2dba637f9916d91d098943fa7070df97af947dfa4bd76fd7bbc2962189b28d7512e7dae7ed94f4d51e034bfe97199b17579bacad1e270cef4 SHA512 265e672878b120fad115a657778bcf3c1abfd32474e17fdba587b979c1758ff71459dd378ee9af024e4f46d493249aa8f34d2eaf60129d82699472597dca0ff0
 MISC metadata.xml 1022 BLAKE2B 2db358d4a174ce71a88af110d028cec634126a174982f14d061613a4edc5e828be353fc67607fcfb17dd2d941f3c79fa016ed8f42295b229a7ab5225b401671e SHA512 71db42211df1dbfe37314400d41e8b31366ed5ae3e25b4a2fd324b6ddb1378b341765c40c5c65152a2bfcd071930c57f5e20ec153b80c370a8c4f49586d05b6c
diff --git a/net-mail/notmuch/notmuch-0.39.ebuild b/net-mail/notmuch/notmuch-0.39.ebuild
index 3414e1775fc6..65e8121d56b0 100644
--- a/net-mail/notmuch/notmuch-0.39.ebuild
+++ b/net-mail/notmuch/notmuch-0.39.ebuild
@@ -21,7 +21,7 @@ LICENSE="GPL-3"
 # Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
 # meant to be binary backward compatible.
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~x64-macos"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	nmbug? ( python )