gentoo resync : 01.08.2021

11 files changed, 247 insertions, 113 deletions

diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index e21ea44a80a9..5fa99e0f4c10 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest
index da875fc2fdb2..05559fa55be1 100644
--- a/net-mail/fetchmail/Manifest
+++ b/net-mail/fetchmail/Manifest
@@ -4,12 +4,10 @@ AUX fetchmail.confd 297 BLAKE2B 00f9a55be3b6351dc7b97758f3403feab9d1025bb2b0398a
 AUX fetchmail.initd 993 BLAKE2B 76fb355805afc0b62f350f02dc0b0d6ac83659d2e15a49309192de313fa38b61e32db0bb9e5148c3d56bae61ca5e714f8d9576e0f95997d45a44d51f56c8235c SHA512 06091152111059425e86207e968ad5819eb67cd2dd264855e7b77a163b95591abc29befe4b3eb8bf2d2af105efb5006bb048f3db4ef3f8f4fafbb78767f69ebb
 AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27fb6ff9f3d5f1d8357302e11e6fc4d22d8944d504bdbb600e87b853e039601b8cca9763e1ca465573508 SHA512 088d7ff2c473d4b514cc5349ba6f10bb7f29ace1141d152db082c801a9dd0e6144a2dd350e27e97f633aaf286c2daa5253e52b5c410737c44f3fd9b5b57bab75
 AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed
-DIST fetchmail-6.4.16.tar.xz 1316660 BLAKE2B fbe592327c52e9299cb09da9dafbf49e6cbbb2d998929aa30222b879a6c035a653dacda033cf4dec5e31cd90f3ebe4f388b1fd9155e65d29259260f30e658af0 SHA512 5e0d87739d73991c56111222cd84d6e16913b205c4d427feeb9b03d7f330442851f48769e168883ad75afc0a9db9b5267d1ad30e2ca0efe14263befd625dccf0
 DIST fetchmail-6.4.19.tar.xz 1316672 BLAKE2B 679d2c49698dd368d32439a8276412e3f32c0a0f6f0e7607bc323c0294c987307469451b4b085fe521f2d5dd4869d59b4841762b6a57b3c654b992e9de8ba87c SHA512 b10f0ac5b3b22f8b1d86367990fc96ea5c49dc21c873890c732c254c34503bd6ab9348c5ef88b99ba0f83f065fa9f9aead55de9721b0f296efa14eac0311daaf
-DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987
+DIST fetchmail-6.4.20.tar.xz 1317204 BLAKE2B 85137bdae2fda05cba6e9bee9056bb9a1ef09b96199dc5f991da9aa5c2073f1c8cbf3fae43999a79de338a95e9d28e474035200758b65ffa9fa18b5a905c1279 SHA512 5b170f51a74b6596020282f5cbb34bf0a9ea8c5b089fd8c6c72df6c7742e16bcd5931d62181d56265779f9c3431c4ddf795a03deee09c5552a3aa0601282bd17
 DIST fetchmail-7.0.0-alpha8.tar.xz 1212256 BLAKE2B 1b123921a696e60b9c42ea30a379bc6cf46bb66dd630f50e1f10ceac5066932da9538295954be451c4665e1186b7281523bbae83fb4cdb7ad2d1b7b408a3a38f SHA512 fdb20b6a4723f718958e8c800d5a996ff0bb8d9ffe485e8f8429f28953a5a691fd8439c29cb4fbbae338d64c1e9cd1f5f9ed6d89261d0ca582f6345cacb696fe
-EBUILD fetchmail-6.4.16.ebuild 2387 BLAKE2B a3f0807de07c27a5e7ff01fa52107d667c36a9a4f105959aeda1ed959fc5cd0c493ce9ec9621e4341eff6777192051e5e0debd41d8b7815855f28fa5e7095abb SHA512 178254b1eb407c4bb6916774f7b468b07c960541b79f9ff0fb90f31d27c7d2d2dfd4237f96967664606792bdc037001fe796dc5c566f2bfed28acda35cf1785f
-EBUILD fetchmail-6.4.19.ebuild 2381 BLAKE2B fb808119e5d5286f0091ee0ddc8a9623bc6d1687805e7bca6bdb2aca1ecfea77b66dff6bf62804c01f142b6297bd9c269290d1ceba6da1fa51615a50cfa60fa9 SHA512 cb077671e4e4d08ad054a7763ae15666807915edce7f74ac282d393a8db075864160c3fb9a3317a0f2f34f4bab268fcb3b26a267c2ce12ed414d421684762598
-EBUILD fetchmail-6.4.8.ebuild 2377 BLAKE2B a7ffd34ba34e384618153aed0557a8dd47e018013e08d12720809bbe3bfb278253f5fe3032c185844a5b4d42a5a719fec38fca9a8ab86ec052a584068aa9882e SHA512 71ecb949c8dc620e9ca9fabce558eecbd00fe8cc9915bf9e7a3b73e27181662ef198cce6b1428f3e39873f2e41bd24e1c56e0e2d39462e83344b5cf395c1e4dd
-EBUILD fetchmail-7.0.0_alpha8.ebuild 2501 BLAKE2B ab0d5779dc6e78fac7f79b411d0118deaf2789ec94021045dd7e0e54816d5bc1760731a2cc06fd0b5c07275a91645034957e01cb7c96cf94b9e536b95c2d7782 SHA512 4309f7ad15ac6bdf8f63540585995c0482a7f1bd4c2b3d44e257702a8d01d914ba8b9ebf2fd70e8d9a6010c06a7d1085306a39a74d577a3216518a5e26221f81
+EBUILD fetchmail-6.4.19.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
+EBUILD fetchmail-6.4.20.ebuild 2411 BLAKE2B 434eb903a6d3664f5ab4aaa98d49e444fec57f732fac15a901d0fc3092514f9efc38f1e216c5a697f75c7a9fddff4e99dbc513780e933b04719cc955d945892a SHA512 721e3a879e4f8d0396665b146ffd7a321bdb091c449706bf1e2759b2b4f1d10e05abf71da640495718c387c92bd1c5404a511aca12307520115a285b4a55cb0f
+EBUILD fetchmail-7.0.0_alpha8.ebuild 2531 BLAKE2B 51172611a85f880f5b31414471182fbbec13207d30c3a1e7101a62ba56e87d3931fb9aa0e1999ef6caaa736126d16c56df0d8e82cab4231f9fdb74fee9dc3892 SHA512 a82d93629559170b406adddfbed04f93f5a856c92fb409254717c86bb284664c240fc69cb07cd5288afa09e41211b129f38be772045877c67fc8e787875207f2
 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974
diff --git a/net-mail/fetchmail/fetchmail-6.4.16.ebuild b/net-mail/fetchmail/fetchmail-6.4.16.ebuild
deleted file mode 100644
index 9a15f59666e2..000000000000
--- a/net-mail/fetchmail/fetchmail-6.4.16.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-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-libs/e2fsprogs-libs )
-	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() {
-	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/fetchmail/fetchmail-6.4.19.ebuild b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
index dfd0275cfb0e..e2ab38dd186c 100644
--- a/net-mail/fetchmail/fetchmail-6.4.19.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.19.ebuild
@@ -98,6 +98,8 @@ src_install() {
 }
 
 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."
diff --git a/net-mail/fetchmail/fetchmail-6.4.8.ebuild b/net-mail/fetchmail/fetchmail-6.4.20.ebuild
index 5e9c5c2ab3eb..e2ab38dd186c 100644
--- a/net-mail/fetchmail/fetchmail-6.4.8.ebuild
+++ b/net-mail/fetchmail/fetchmail-6.4.20.ebuild
@@ -3,10 +3,10 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="tk"
 
-inherit python-single-r1 systemd toolchain-funcs autotools tmpfiles
+inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="the legendary remote-mail retrieval and forwarding utility"
 HOMEPAGE="https://www.fetchmail.info/"
@@ -98,6 +98,8 @@ src_install() {
 }
 
 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."
diff --git a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
index 2a9b14181a09..80f96706c304 100644
--- a/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
+++ b/net-mail/fetchmail/fetchmail-7.0.0_alpha8.ebuild
@@ -101,6 +101,8 @@ src_install() {
 }
 
 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."
diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest
index 5253383f106b..9ebf1480cb63 100644
--- a/net-mail/mailutils/Manifest
+++ b/net-mail/mailutils/Manifest
@@ -1,6 +1,7 @@
 AUX comsatd.initd 569 BLAKE2B 1b4ad287b67ef6d95fbc626296e79a857264754159967c54105e9d9f4493e95d3494cfce6082f289358021e02bbaac580a1b4d78ca8b2cc713af57197e532431 SHA512 9c36ddf70bf4f0e3c56f55651a740014078e3a1a79569a62ccd74e1ec7167eac6ecb69d56c15913d815c472fe943d17a1e781a669208d37c97671afea2208f8f
 AUX imap4d.initd 566 BLAKE2B 2d030e47f63b4133eed4b47c9069c54de290f907d9429eb99675380569e1e0efdbb1172664ba1ee0f2924ac7284981fbe350d1543a6d0790722456523d997535 SHA512 51d6cf4285c6823d97e52c7eb408a80aa66376f329685acdc21e096c2099a044b2fd18e7b9e5ed89406a3cd1f16b7aa7b0243f8ea46aa7824da48b566ec00324
 AUX mail 82 BLAKE2B 6d9cc293deff8f99cea0ce8842dd34e658844ca9a1f4e530d3c95f8154ed337ab6ccc2b6263af9cfa8078913a7b70beb5874c999174d5648c1faeace8f68e146 SHA512 80080a3118ed66cfde44ad3663e4b07bcd5fe756b86a213ea4e1ab86e27f8485dcf02af3ee6b7f6f12105a267b9619376668e0cb6e60743ffb7664d2dbea9144
+AUX mailutils-3.12-disable_escapes.patch 781 BLAKE2B fdd350688f96d4b073154005a68f3eff179a0264bb4611916cb24955fb6759de534ec3cdc04bd9bb687eeaf4f714de5c590030c3a897dc8b54ca4d843ebdd6b0 SHA512 383dbe4d55a5fdaf3b62ee4a3743c04eb53b46246d1a08aff1c4b42171914014b39c1e2c3cad5b0c7bd6649d97ee5377c5643319d875b4fb6f7a93aea0b5fec3
 AUX mailutils-3.12-fix-big-endians.patch 698 BLAKE2B 5d73570756063047633c82df2038c29999b3f9aaa48d7bfe58cf48c985107c43e36a717203b323506a9c8e24dfc579c218c2107e5a59de642290d3699a9c8867 SHA512 78af75afb332a47b4780ea1a1d67113e7e71febcff6044c8e9281e09017181309d1665da50010db1ccfebffd2c0d9ddd10e753a867c9aee9d99b67f9475ffce1
 AUX mailutils-3.12-misssing-endif.patch 689 BLAKE2B a54f086b1fccd4c5965ef849158e0e667f25abb6f095bd5e8aa63b53199e01327c3de33b43892da1eb1429dc0443a5133880bb27374f128a4f00e58d476a7740 SHA512 40dc7fe324014eadde44e55af2a2de4e474a2f6c2bd3a3fbea10446156b4505cf36c89c7458da74749ab276570f5bdbaddf842ac9cf289ca7e7a4888d463a5d0
 AUX mailutils-3.5-add-include.patch 275 BLAKE2B 2502fb3226bc63ae98d018392fa1107b4079ea51cd8e57b4e97522d21e696bd6048fad2de885f88644d23f434a6e407f42ba8fcbcfe5b1e65884f37718e34328 SHA512 0972cde536a1a82fe243c9b048fc15f4863586a2344b54c9b4f6f8a5935762c7272c0af2698239af7de9da62b1c2928bc7f621e01f447423fdd8288cedee88b6
@@ -8,4 +9,5 @@ AUX mailutils.rc 258 BLAKE2B 3dc68190e11c8bf5016b0fe8b22c61f79ba7de96a1f230f7d07
 AUX pop3d.initd 563 BLAKE2B fd09d7a7499c888eddfb812644102f979c2423e9b1a9f0077655b6ae4c1eb4214f685ef7843e74a808e52ee988cc3fbefa278754db824256a4972c83fc0ada31 SHA512 7847c29a03f21df82d36c077ccb38329457a332cccdfba24bee3b1c9a8170fc71c07ee674408f069693953dd1bf44b8b8f782dcc35d6b16e62f70b2b32ce018f
 DIST mailutils-3.12.tar.xz 3134484 BLAKE2B eac7934e9332482adffa3d4b1574d89a65949644ca8dd14e507e9c5f268d485b97f4d61deadf34b2ddcae1b91deee93372e9ebd53c88a0c0092346a0d83fd67e SHA512 a7d681bc7a763b7f09b704c8a536ea1c2444c52ca736eca321ca72fd32e2e62c0e14687ba79654d9162d45189d0621b1c75c639b81e04a79bbf3b3c09b9cebd2
 EBUILD mailutils-3.12-r2.ebuild 3691 BLAKE2B d2dfeab68b8c1165d6cfee0c9333e99c42499fd9e43475f45fd44338926a1810fdbfa0283f72471148b625b3538605b484618c18e935a109e92064cb15d3b8b3 SHA512 40b34e364f380074a48647e6d897f6f7841dadc3ca7c1723289b11bdabf98f1757b6e990bf4b510b1322dcc943bdaf703ca0e6d5703a4445314c70801671147c
+EBUILD mailutils-3.12-r3.ebuild 3704 BLAKE2B c42084fe3f0993a5e1d4c2dff6086eaa919b2a36fdfc69ea25ba87d6cf883acfbc0ca3b5f250b77c8848bc304a4b4fd7d4ad800ab14213ecf62006d928abb445 SHA512 03aeac5de0343ae0d354e45055188259739a6969f2b76f8b473917d14210f8e96c151e0c7cc2f3db8c062279316ee506b4ec094a44d0da51ff8a15cac6cae659
 MISC metadata.xml 602 BLAKE2B e29b6203ef727041c0bb5483d46ddbd256f55f40d26ff94008fc3869dea23036369029a168a5b31fe3da8ee9c529d8c1cd9d0004691670cb9bebe77ef4973270 SHA512 602ef10835b14c359ac19dbce157ef5c073acb52286f7349feb4b8ec3940899ea4dba9d77ad4d4a3d540d86576cfb9f46e502cb9e8aa60cecb4a2f4b0b6358da
diff --git a/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
new file mode 100644
index 000000000000..073d1b671219
--- /dev/null
+++ b/net-mail/mailutils/files/mailutils-3.12-disable_escapes.patch
@@ -0,0 +1,24 @@
+From 4befcfd015256c568121653038accbd84820198f Mon Sep 17 00:00:00 2001
+From: Sergey Poznyakoff <gray@gnu.org>
+Date: Mon, 19 Jul 2021 11:27:40 +0300
+Subject: mail: disable compose escapes in non-interctive mode.
+
+diff --git a/mail/send.c b/mail/send.c
+index 1bdfe1134..098374dab 100644
+--- a/mail/send.c
++++ b/mail/send.c
+@@ -1324,8 +1324,9 @@ mail_compose_send (compose_env_t *env, int save_to)
+ 
+       if (strcmp (buf, ".") == 0 && mailvar_is_true (mailvar_name_dot))
+ 	done = 1;
+-      else if (mailvar_get (&escape, mailvar_name_escape,
+-			    mailvar_type_string, 0) == 0
++      else if (interactive
++	       && mailvar_get (&escape, mailvar_name_escape,
++			       mailvar_type_string, 0) == 0
+ 	       && buf[0] == escape[0])
+ 	{
+ 	  if (buf[1] == buf[0])
+-- 
+cgit v1.2.1
+
diff --git a/net-mail/mailutils/mailutils-3.12-r3.ebuild b/net-mail/mailutils/mailutils-3.12-r3.ebuild
new file mode 100644
index 000000000000..b8efb6324f39
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.12-r3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+
+inherit autotools elisp-common eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://mailutils.org/"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~ppc-macos ~x64-macos"
+IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \
+	ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \
+	tokyocabinet"
+
+RDEPEND="
+	!mail-filter/libsieve
+	!mail-client/mailx
+	sys-libs/ncurses:=
+	sys-libs/readline:=
+	dev-libs/libltdl:0
+	virtual/libcrypt:=
+	virtual/mta
+	berkdb? ( sys-libs/db:= )
+	bidi? ( dev-libs/fribidi )
+	emacs? ( >=app-editors/emacs-23.1:* )
+	gdbm? ( sys-libs/gdbm:= )
+	guile? ( dev-scheme/guile:12/2.2-1 )
+	kerberos? ( virtual/krb5 )
+	kyotocabinet? ( dev-db/kyotocabinet )
+	ldap? ( net-nds/openldap )
+	mysql? ( dev-db/mysql-connector-c )
+	nls? ( sys-devel/gettext )
+	pam? ( sys-libs/pam:= )
+	postgres? ( dev-db/postgresql:= )
+	python? ( ${PYTHON_DEPS} )
+	sasl? ( virtual/gsasl )
+	servers? ( virtual/libiconv dev-libs/libunistring:= )
+	ssl? ( net-libs/gnutls:= )
+	tcpd? ( sys-apps/tcp-wrappers )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	servers? ( tcpd ldap )"
+
+DOCS=( ABOUT-NLS AUTHORS COPYING COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5-add-include.patch
+	"${FILESDIR}"/${P}-misssing-endif.patch
+	"${FILESDIR}"/${P}-fix-big-endians.patch
+	"${FILESDIR}"/${P}-disable_escapes.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if use mysql; then
+		sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+			sql/Makefile.am || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# maildir is the Gentoo default
+	econf \
+		MU_DEFAULT_SCHEME=maildir \
+		CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+		$(use_with berkdb berkeley-db) \
+		$(use_with bidi fribidi) \
+		$(use_enable ipv6) \
+		$(use_with gdbm) \
+		$(use_with sasl gsasl) \
+		$(use_with guile) \
+		$(use_with kerberos gssapi) \
+		$(use_with ldap) \
+		$(use_with mysql) \
+		$(use_enable nls) \
+		$(use_enable pam) \
+		$(use_with postgres) \
+		$(use_enable python) \
+		$(use_with ssl gnutls) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthread) \
+		$(use_with tokyocabinet) \
+		$(use_with kyotocabinet) \
+		$(use_with tcpd tcp-wrappers) \
+		$(use_enable servers build-servers) \
+		$(use_with servers unistring ) \
+		$(use_enable clients build-clients) \
+		EMACS=$(usex emacs emacs no) \
+		--with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		--with-mail-spool=/var/spool/mail \
+		--with-readline \
+		--enable-sendmail \
+		--disable-debug
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	# bug 613112
+	newins "${FILESDIR}/mailutils.rc" mailutils.conf
+	keepdir /etc/mailutils.d/
+	insinto /etc/mailutils.d
+	doins "${FILESDIR}/mail"
+
+	if use python; then
+		python_optimize
+		if use static-libs; then
+			rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+		fi
+	fi
+
+	if use servers; then
+		newinitd "${FILESDIR}"/imap4d.initd imap4d
+		newinitd "${FILESDIR}"/pop3d.initd pop3d
+		newinitd "${FILESDIR}"/comsatd.initd comsatd
+	fi
+
+	# compatibility link
+	if use clients && use split-usr; then
+		dosym ../usr/bin/mail /bin/mail
+	fi
+
+	if ! use static-libs; then
+		find "${D}" -name "*.la" -delete || die
+	fi
+}
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index d37350d6ce93..6b0b76da28a8 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -3,7 +3,9 @@ AUX mu-1.4.15-guile3-1.patch 5237 BLAKE2B 49fb8d7c75d0dc758b7a0cc4d69fca9a1d776c
 AUX mu-1.4.15-guile3-2.patch 506 BLAKE2B ff01cdf9d9da6d4a2f2517c9a6df56e13929e4e9795f951c8f0cd3778c6a4f82cec305e2d24e05040b2395796690b9205e22699ce102745e9367e926ef6eaccd SHA512 c1da640ac0d900653b21d64b3078b8c3a02bc38a2745adb76a2c3c27f8829d0678daa18bb58e238d07a2d01d716a4291746840ad5438caa9637454f17ac8ddb4
 DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546
 DIST mu-1.4.15.tar.xz 846052 BLAKE2B 933d04696c4ac145f20ca6c84f6fbe62f70fa3e45e50dfdf2e48a7007acecc56d8650f965dc6810fc7f8bbdae6595b7b7349f2675b08cd9fb619ee9eb24eb251 SHA512 e7741b77bce5c7c1c818549e803fb386f0b8727b995a7ac9b961b74e89cc7dbeed52b45d70895995a1640cfd36a49b052eeeed9be6c48999f2182a68bf5c205e
+DIST mu-1.6.1.tar.xz 866044 BLAKE2B ed6464e2ef63d37c42783235a0537cd20c7442333d4a6b59af0d257db8e3e6d85db7106ae2f89aa5f1536e50afadd40c89a8215a288080130d14e3ceb79b1638 SHA512 d894f302cabef86ff6b1d85eb945b2aca27729eaa6558598076c8f065d584592d5e601fe6a6045cea9b8a1466320c838f995ffdfd564447683538a5e48f8d7b0
 EBUILD mu-1.4.15-r1.ebuild 1374 BLAKE2B 6b14c1413eff8c536636d0a4e4a9ddc7db6a725f30ea34e48fe74154a5ba233aad28d268202adf1859cf7955dc78d083a72f97133951afc6c1d4ceea4fbdfdf9 SHA512 ad2787b57a340441aa760c7ff19dd906cfe7abf796136d5d72c6e2dade58dcd61f4204e192beff1d5f1f14636ecf6e451903073fea6f80dc0e8c676282bb7618
 EBUILD mu-1.4.15-r2.ebuild 1535 BLAKE2B 78399a21ac72dd380d097c76b15e7146e5e1d470fc16ec5c548ab18a56b4e0419751b68f3515bedebd591ad44bd68cbf7d451821a5b3c2cb1eec43a208516046 SHA512 18d3d5d1f811925cd2cb01c0c4302b76a841d0cd46e6fbc9cf52ffec716fd2f34775d06df10a1c51e6553e763d6be9675fe1ce0612781c2b2abab1c0e9d79fd6
 EBUILD mu-1.4.15.ebuild 1772 BLAKE2B 8b31278a7ee402b88f93ddea57340c8067be56a7b9377d20d705bffb56c2baac4e0c9c1bde2ce0b1b432e68b7bf40229e4ac775fa66a43df126f7cf22aa504ab SHA512 a611058c25591343bf57a5a820481516b71005e811e60a26b47d25f04f7ec8c5ca9b9936d5259f8fbd9f17c296a01246a48b451ef21a52268991b19dd6960441
+EBUILD mu-1.6.1.ebuild 1393 BLAKE2B 2b5542aa0646a1927db640b66a3d02a4124ef2821f0b583520267e6d48d21ad705c6a2335a550155a99e67239ff659da1f13a7165d7e73fbe956df44112698c4 SHA512 259f17e0b118aea57512d0c96ea37aeaa905586200a47cbfc90c9b80dc0fa1bfe6dfd634037cd68bcbfe50094479d2b917bdbb1533509582c014ea05d7634ed9
 MISC metadata.xml 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3
diff --git a/net-mail/mu/mu-1.6.1.ebuild b/net-mail/mu/mu-1.6.1.ebuild
new file mode 100644
index 000000000000..0d32259bccc1
--- /dev/null
+++ b/net-mail/mu/mu-1.6.1.ebuild
@@ -0,0 +1,63 @@
+# 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 mug"
+
+DEPEND="
+	dev-libs/glib:2=
+	dev-libs/gmime:3.0=
+	>=dev-libs/xapian-1.4:=
+	sys-libs/readline
+	emacs? ( >=app-editors/emacs-25.3:* )
+	guile? ( >=dev-scheme/guile-2.2:* )
+	mug? (
+		net-libs/webkit-gtk:4=
+		x11-libs/gtk+:3=
+	)"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+SITEFILE="70mu-gentoo-autoload.el"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable emacs mu4e)
+		$(use_enable mug gtk)
+		$(use_enable mug webkit)
+		$(use_enable guile)
+	)
+
+	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
+}