12 files changed, 147 insertions, 197 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 8d22d48f840d..1f0d6761c8fd 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index d68818a5bc17..7105210015f2 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -6,8 +6,10 @@ AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27f
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
 DIST fetchmail-6.4.21.tar.xz 1318996 BLAKE2B 4c2befad2b7dfa6957889e029572c259be7a20e4b54b864e2cca827540d745a57ad227f8e1fce1336e8f3a1005c780d8fa7c1b10b9ee05ce68dbcfac75afa179 SHA512 c9300f63c0e4073f199a9a7d9061774a7f88aad496b696cad96c0ee85107cae506461f0cd083903c60104b1e7654461213f3f759c1cdaffaf1c85fb1956faa67
 DIST fetchmail-6.4.22.tar.xz 1330176 BLAKE2B 7086f8a3df263f68ae2034321f63c40fcf4759517f46c67ba4b5d3b33ba07d3bb4f512d749a67a2d76991b46847b6dd9df0795a7a28e8166842454001497cfc9 SHA512 ff6db2705b6e3806e22c326da8a0f6bdc0909965cd283b50f9d55bd3a18a52fc4b2f4b4afece1e81aa25b6f1037450cb2b579c4d2cfe4705d34b31d4c1a47e00
+DIST fetchmail-6.4.27.tar.xz 1326668 BLAKE2B fb349f8e4b17929d8ab5ec144e2d6e4227b56143112eb3745830c339f8dfdaa80fb47060ad3671258563198ed1283a903fcd5a82564b7320a829ceb4c5826642 SHA512 75650c2a8bcfa6f4364dacd6964f00848a23e1bc96eed10f7fcfd9c8c6f6b6fe60eee2730c57c8a5263c11f01b3031cbef7d6b2bffa730de63e7ec262448af2f
 DIST fetchmail-7.0.0-alpha9.tar.xz 1213244 BLAKE2B 895fe178993cc34500e276bef5ebe9a4fd81fea522d39fd271433320afc46faa9657d8b85b2d28cd5dbc6d3dbbb233d5eb27d3e26205f5406de9f750c50d7f1b SHA512 7ac1c26edfd2a0d69ba3c1e9f47d96aa48f1cdc10060ff928f952e43141651896f5c5190c41064075fb5c5837516f63d6ff3e7fb0cdc7d389c44b6e39db01d8f
 EBUILD fetchmail-6.4.21-r1.ebuild 2404 BLAKE2B 0526de2e2c4b499d00c87cf303b69bf92831ef57508c1736f0778b10d95f801e7ed2a53755e481ae5457ca081e3fe8feaa97ecbc7aedcdabf093ea7b9082d19f SHA512 a6311cf3cdf4b349ecced75080bac3f6929efec60d69b17474ca2638c0f9f1ccfaa87d970bcb3058768ef17e5bf96912e2b90be5cd8745c81974c2c49ff5e961
 EBUILD fetchmail-6.4.22.ebuild 2410 BLAKE2B 6cc76486f6785669f7f33b6253f0f6f0806e52b92d620be4937fbc59bbbd2f5089d8df3a5be15fe90190bc93190e72e80ad4014455df2be25f3d74ab1363ca77 SHA512 ec65e9036f5ba09e2b85cafeaefcd5fbdc7bb677d39812629fced391a1216688035acf78ce13af75dc193974662f8f53fa29d9ffb3b353720a725fec902e099d
+EBUILD fetchmail-6.4.27.ebuild 2412 BLAKE2B a2644e37ed48a91d36ec5a1c78745a65927e0b05b370bc9711f219ced2dae8ec33e8da4139d3d9def9a3e4d2fbcc4fe689eaabd237823266fdf8ab0d86b5d357 SHA512 2e24460b86d3bb8686a4d2bb79afb79b7b3c552cbca5039309561a744e271af796e1c020e2ca4983d1cff65cd38f16e0210a152b47255362419ce00a58dd5a68
 EBUILD fetchmail-7.0.0_alpha9-r1.ebuild 2524 BLAKE2B e0860a0bac968a4c329886ea0a87202e4fc456d7e18962226aae9b4f8ad908ae912f0dfa236de6cce96e00d1cbf5d7d49f1f75405c496eb47c5c7f1d32e266bf SHA512 97b684257c686861f8420b2f576f1d9bf55d04ba5f48544fcd36b85b0fa9f5becc6239e78d6237e33002c337a13c644ad216a71a5407138814fedf4a55be8423
 MISC metadata.xml 522 BLAKE2B 34e08c52e9391d8f01d717516857cde4c2c77af269d587a29ce6d6e3c6c2e989898f5afcb1240f6718dbdb18be2700b66980f5a684c253c69ed4123e6bb6905e SHA512 8c6fd6c541834669a9518b31859990c8d6e9946e35bc1aa00bf2e0c1822392508ff712119005b97f5e85ca74e97c0d5cf3ced5798a388c23f9c8fd959feaf8cc
diff --git a/net-mail/fetchmail/fetchmail-6.4.27.ebuild b/net-mail/fetchmail/fetchmail-6.4.27.ebuild
new file mode 100644
index 000000000000..6ade24bb6f82
--- /dev/null
+++ b/net-mail/fetchmail/fetchmail-6.4.27.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="tk"
+
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
+HOMEPAGE="https://www.fetchmail.info/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ssl nls kerberos tk socks"
+REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="acct-user/fetchmail
+	ssl? (
+		>=dev-libs/openssl-1.1.1:=
+	)
+	kerberos? (
+		virtual/krb5
+		>=dev-libs/openssl-1.0.2:=
+	)
+	nls? ( virtual/libintl )
+	!elibc_glibc? ( sys-fs/e2fsprogs )
+	socks? ( net-proxy/dante )
+	tk? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/future[${PYTHON_USEDEP}]
+		')
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO"
+HTML_DOCS="*.html"
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.3.26-python-optional.patch
+)
+S=${WORKDIR}/${P/_/.}
+
+pkg_setup() {
+	use tk && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	# don't compile during src_install
+	use tk && : > "${S}"/py-compile
+	eautoreconf
+}
+
+src_configure() {
+	use tk || export PYTHON=:
+
+	econf \
+		--enable-RPA \
+		--enable-NTLM \
+		--enable-SDPS \
+		$(use_enable nls) \
+		$(use_with ssl ssl "${EPREFIX}/usr") \
+		$(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \
+		$(use_with kerberos gssapi) \
+		$(use_with kerberos kerberos5) \
+		--without-hesiod \
+		$(use_with socks)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/fetchmail.initd fetchmail
+	newconfd "${FILESDIR}"/fetchmail.confd fetchmail
+
+	systemd_dounit  "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	dotmpfiles "${FILESDIR}"/${PN}.conf
+
+	docinto contrib
+	local f
+	for f in contrib/* ; do
+		[ -f "${f}" ] && dodoc "${f}"
+	done
+
+	use tk && python_optimize
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please see /etc/conf.d/fetchmail if you want to adjust"
+		elog "the polling delay used by the fetchmail init script."
+	fi
+}
diff --git a/net-mail/grepmail/Manifest b/net-mail/grepmail/Manifest
index 6d72c4810d89..11af79be57f3 100644
--- a/net-mail/grepmail/Manifest
+++ b/net-mail/grepmail/Manifest
@@ -1,5 +1,7 @@
 AUX 5.30.33-fix_nonexistent_mailbox_test.patch 1138 BLAKE2B ebcc4958fc773f4ee0d1156f6ffbb722fc985d641c5e9b4a7fb1f12de90faf85808c74719271b99159572f86244aba2ef98adeffc106392f22e636d12738bede SHA512 88c3123ea5031a9d925cf8c7464b53290a4015faf43b2ef5a0543698d8374e45b93291bf1eefe636b52ba4a8d1a9ebf2dc3a9261572bfd5bcc9f16f1671e8969
 AUX 5.30.33-midnight.patch 560 BLAKE2B 4b2d085dc8f334f1ec1a9949ef91524791c841a5bb6b92a69c90d87ec62aaa4280558e8a57112b6d085beb34551a1b42662ae6a5311ffc5f60da6d5b9b8520c3 SHA512 41ce56d0a2371bcc527f997825530e87ad0199c78605ea72567255cb985158fa56e669aeea966a547ccd970231bda1a5da783320fda1568642890e9832c69775
 DIST grepmail-5.3033.tar.gz 536791 BLAKE2B 400cc3c30a291f6075d343522a4f506997e3328c2adda2cfa7d4449052ce5bd6112fc06a44f8359def6358c716422b5c33353c7247dd6b5cf6c5a0502a2c34d6 SHA512 58fb63c42b534ba32d8224753cd11701adc3ab6eeca838753982cd6fdc46c05142eeb34106ae585b48698c299648cc2e0135215900ce28dd7c84921c8ad7831f
+DIST grepmail-5.3111.tar.gz 560547 BLAKE2B 88c9e841aed419ae428c45dd9a1bfb294076d73a3635e06b50a1f5b3bb3d2d447a8c586054b80ad793ccd6b2b2cb16394486d044f988c5760c04f9fe2da0e73e SHA512 50df6585ecebb838a2b60c048e66588d7a161a88256ffce2c7313e61d32751739b3c30a64deb43dcd2a5933970cacc812fbb2dbd9f91a8ac34012e0581cd2962
 EBUILD grepmail-5.30.33-r2.ebuild 1039 BLAKE2B d906e5707d8704752811797b7964aa63732aaeb369d209e237247c7ad1d66d2667a7ce1df70bbfb959148698e3ab8ffa2ba3a8f51b496049c505f3822c413c31 SHA512 9582058ef44dd1dfea0cf0230a7ad66be28dededcdaa2f2b5590d3168d41c176ad1ddb893596d97fd1cc699320a2e488b1a0555a1be5ea9074d4b02957ae36e0
+EBUILD grepmail-5.3111.ebuild 687 BLAKE2B 90630630731805fd859b793187c7cd9553ed8b3c4c85b9395e932c73da57c8627f437addc1d5f3953ff1b9624fbe920bff4142c3a8374a891e584725842ec92a SHA512 fa068b49907cdd2c0f501dc0bffc6b4f440d0540447cb7591b1705bcf00c56fae7d04be2283a7c04c31cb0a896870808d40c730dc32ba5437cdd4e10096bd369
 MISC metadata.xml 246 BLAKE2B e117fa7ba84c2250c8699ba7658f09aeefda0f7977dc851b17ab79b20e9c139e94de32b755136f4a7e901d0a2cecf6e3a8fc88521d1eb2767dcdc07c8f43fd37 SHA512 43283f70e6e72dc2211754908e9bb54668d4f0d569ebff77890b291868a27d08abf9d530de1be10e72cf0ac95c24a7ff491490b90a30104364f1b6fd93147354
diff --git a/net-mail/grepmail/grepmail-5.3111.ebuild b/net-mail/grepmail/grepmail-5.3111.ebuild
new file mode 100644
index 000000000000..ef49558b1a95
--- /dev/null
+++ b/net-mail/grepmail/grepmail-5.3111.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit perl-module
+
+DESCRIPTION="Search normal or compressed mailbox using a regular expression or dates"
+HOMEPAGE="https://github.com/coppit/grepmail"
+SRC_URI="mirror://cpan/authors/id/D/DC/DCOPPIT/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Date-Manip
+	dev-perl/File-HomeDir
+	dev-perl/Inline
+	>=dev-perl/Mail-Mbox-MessageParser-1.40.01
+	dev-perl/TimeDate
+	virtual/perl-Digest-MD5
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/Test-Compile
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 15c424b58558..dc0e3f5bb8bd 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,4 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
-DIST mu-1.6.6.tar.xz 866724 BLAKE2B 3417d4b3e5bfae943558fbc936ca0207be912f9548621b1599437484e94f3b49271aa1e97e7cc2b5b6027b8e0cf97d3b96d2052772f7783d897b4fa0dcf03184 SHA512 07daf9864bfd1ff4278aee98a0ae9c4fc3be94468e3b2022ae801f048f339b5becdb9ad8ebb2e12b9131e0e6dfcfb541bdca8288657dc19d47b0e510831f54eb
-DIST mu-1.6.7.tar.xz 867136 BLAKE2B 12b19d15c01a7101e3a936b12ee87fa5519c0e047e354f2fd1d481939dd5dffa34a94a5e7f3fda20e27771377e78524065cf5f93f7a2f818e202cdc93090ebff SHA512 ceae7b4508fc607dcda0fc20e9fb92b3533b1ba7ef94823cba2cd3a6ad3f18ccd3d2ea7da20e4c190e53f2d00ccdd3e1d25e12b89a08bf5233f5656be90b3c14
-DIST mu-1.6.9.tar.xz 867188 BLAKE2B 526f67acd505a1d02cc12841d7d5f99e4b91a8aa3923cc1bccf045faf3a89bef99827c7461e78d000aefa48634a38fcf263346c14f275e3053c9774e2f8219c9 SHA512 c0ba5fc984fa445c44f89b84f911952c4a3aebf9484c60df75bd6a144cad3e68e1b2de98d8bbf5faae51d81ed99adb85280e4c1a40e7b0d587a00e0d80937495
 EBUILD mu-1.6.10.ebuild 1440 BLAKE2B 3e3c39a2691959ac6502772a4543d87d1cf1c9feaf1b2c8d44a2459f782236fa6c96fb42c59e8aa7c409352060a5b5a85361d203f71b810094491cc7bfd2b6a8 SHA512 42341654db5689f0fbecbce749e8653ccdcaf25d7dacd69d531a56ef3782e1ee0f12e307c28cfb8cdac1b749220770a14919476c4663ab0c392f766c146f4909
-EBUILD mu-1.6.6.ebuild 1362 BLAKE2B ca704ccd04361f92723d13c12a9a97f744ad2715f79a406b1dd40848984a7ff256aa73f9e8c8656c7ca67b51a7a699ccce366ff0c2e5dc9a6cbbc57dce27219a SHA512 05b1a606d2821b1cfbd65e3c6377e30d82ae1d6878e276685d70e7b76d80183d14292d6131c3e28d4f1a4f59c80234bc1e41cb5092dfcdceb1e88c243047c7a5
-EBUILD mu-1.6.7.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-EBUILD mu-1.6.9.ebuild 1447 BLAKE2B 1c45f7512eba7de8aa94f59d0fef1e5ce91449195ac88d005e411e4f14c42d43f277cb1c76b654cd3e6468fb25151f2b966907a419b127b92c52845b81e7efde SHA512 dc299eb6a94a090124aa1c16f783c81c49cb93b7415fb9b9e5a344d6d1453ba0aa8aeb72c4bd913887af3265545dddefc6aba2513c18207783a5bd9778c1db05
 MISC metadata.xml 853 BLAKE2B 3439781265eac626261d1717e8ebf8a34a9263b4eaabd37f3a886d1c563c2ae539051741c84b47e8621dfe4513e5213248ba8bcac35dc846bb8676ef5b7239a3 SHA512 4f602ca074a2456393de9394a66de51000351022ef3ad19dd0a2e95d00b70c538f9d96042a979e9e7f714ea9441ca3c52503a4018b15534e0abf1d8a55c7534e
diff --git a/net-mail/mu/mu-1.6.6.ebuild b/net-mail/mu/mu-1.6.6.ebuild
deleted file mode 100644
index d61ad8bf9f92..000000000000
--- a/net-mail/mu/mu-1.6.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="emacs guile readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable guile)
-		$(use_enable readline)
-		--disable-gtk
-		--disable-webkit
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.6.7.ebuild b/net-mail/mu/mu-1.6.7.ebuild
deleted file mode 100644
index 94eaeb52fa23..000000000000
--- a/net-mail/mu/mu-1.6.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs guile readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable guile)
-		$(use_enable readline)
-		--disable-gtk
-		--disable-webkit
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.6.9.ebuild b/net-mail/mu/mu-1.6.9.ebuild
deleted file mode 100644
index 99c3950607fc..000000000000
--- a/net-mail/mu/mu-1.6.9.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/${PV}-signed/mu-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
-IUSE="emacs guile readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable guile)
-		$(use_enable readline)
-		--disable-gtk
-		--disable-webkit
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -type f -delete || die
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index 90e4b4064983..0a1ceb328d38 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -3,6 +3,6 @@ AUX notmuch-0.32.1-tests.patch 4674 BLAKE2B c2eff70dcbf18a3276a97b3a9058f2a51647
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.32.2.tar.xz 725652 BLAKE2B 02801f57bd62b8020298babcc8243276f95fb535621178b2b0b8dfb58d14e8123b7b1fa7d2c246c9e005ca2c7c2d594aeea710408c3d14f26ffcd550c03b4d9a SHA512 e4151cb3ba0e5d26e67572a37c3132d0e35af5d9ca4339d88d8ba25385b6022c376a75abcffb57fda3242c836f6e40dec39c4038674682616b6e5785223295bf
 DIST notmuch-0.34.2.tar.xz 749384 BLAKE2B b8abb99cbb3632bd42742e3f31fb76b7113c2f9c4240081efad940d2fec139f442cc7d21be5b67ca7aca7ce730e9e3b9f8db690ed3a1239946ec490a089b700b SHA512 fd15145404c621fb259b869ddfd77d6302f777a8ead203cfe3a62b66b452f7d3737b214657517c592ce86ce37fb914f800830ea9d05da20d59ec09feaa81d20c
-EBUILD notmuch-0.32.2-r1.ebuild 6727 BLAKE2B be60546e92e1ccfef8fcdc2b00a5f985244ca6a424d3382814b47a33197c82b4b32b7b8c5ada81c65d3addad2e2ea9361429c91355925243fd603a6a7921b948 SHA512 93f4e387aa03555296de37677efc8006298b43bb9fe6ff016fe85aa0d266a53be805558d1ebd4a91a1d66c9cff22d9d27d0529f511776c86823748181cdf1aeb
-EBUILD notmuch-0.34.2.ebuild 7236 BLAKE2B e5ce38995edef03ba47768537c19ec29ea8346957c467bf1868d737d97379c7ca3195767ee9d206efcfbc64b8457ba8560c3358a5d7b0529315780603a9349d9 SHA512 09a88a14e6a4347ea85a7bf3c7e5a29dfecf5493a9f8cfe30f9b6bb55c100d8d2edf74ccb450d3bb4078812d285e49fd37625e3d3ae7afc3dacaa412dcef8935
+EBUILD notmuch-0.32.2-r1.ebuild 6695 BLAKE2B 8f01ac8bb8bdef61b1ebb254b3f28d8045fd6261f4d7c811953ede24c95679d63ca8bca74751c9782460217203ba84b024df2797ed78c19ab0cfb429b0e517fe SHA512 71abe966ba3f07cd291cce8deb512278631b7f3ef49e6d1d604ee825ecbed2e2e57859ec54e23832f2196852888440360c91705ac20c833fc0918dd6e7b15783
+EBUILD notmuch-0.34.2.ebuild 7204 BLAKE2B 55363232c92a608522b2d50c876f117ee67eafd79cb610f5c1bdd34bf874d92eb5f5b652b7157ef892c212c92f7f1b7b14c14ddae927fb094ddb1c8a319214da SHA512 a47d245e59a41d2384b64c2c81783c57b28a0e684719e5fa5ca8a0cee140eecc937da9f4c10487dfbe7dd1f59169313438ca6ee5636ca1d0de1c6c2c8eae130e
 MISC metadata.xml 1303 BLAKE2B 0efb03056bdd6b69e5a34feda715557fa94ae797ece1ac650d7ed3719a439069c9fcaf8308fb893048021dbf9b0691ea01096f7219fa5b9367cbb16c261c3372 SHA512 9eb0041d9336fb9778532e4947f37af4ec4272c5fbd24dd0cf26c8779e2e609a7198f107b2538b2e6c2b20cf29e2c648a59275725c00cad8ef550ab9bcab355b
diff --git a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
index d99d63cef1d2..788bd1925968 100644
--- a/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
+++ b/net-mail/notmuch/notmuch-0.32.2-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
diff --git a/net-mail/notmuch/notmuch-0.34.2.ebuild b/net-mail/notmuch/notmuch-0.34.2.ebuild
index d7b1744e55c7..d056fb61c403 100644
--- a/net-mail/notmuch/notmuch-0.34.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.34.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-DISTUTILS_USE_SETUPTOOLS=manual
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7..10} pypy3 )