gentoo resync : 20.10.2021

6 files changed, 5 insertions, 133 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index c1095c804c8e..8f13d0e656db 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-DIST mu-1.6.1.tar.xz 866044 BLAKE2B ed6464e2ef63d37c42783235a0537cd20c7442333d4a6b59af0d257db8e3e6d85db7106ae2f89aa5f1536e50afadd40c89a8215a288080130d14e3ceb79b1638 SHA512 d894f302cabef86ff6b1d85eb945b2aca27729eaa6558598076c8f065d584592d5e601fe6a6045cea9b8a1466320c838f995ffdfd564447683538a5e48f8d7b0
-DIST mu-1.6.3.tar.xz 867224 BLAKE2B dffe67df4731028fa5e77d62d32fb787639b25d43a48aaac0c0e446c14cd3c5f79ad5559968446603782f1a7df9c129b2c3e1c3576e01d162a59693a2abd960e SHA512 73bfc85561cbc31d8c8ba6043ad79b7c17ac33edbbfcb3f09d460b291454c7696b282ee98c7738e05a9842963169c3f87eff56c3f6729cb22cdb6136ae8b95e3
-DIST mu-1.6.5.tar.xz 867240 BLAKE2B d3e8ad88b38f1329e4a5716f981c97e62c2042835e81910dab02b1219abfc670fe84a68f992fd08dce282a3288aaa91a465ce881f79e7ece917ba089c2ad0348 SHA512 b25203d281fa43b22abacb442caa56d797489d32bfc1dde874d23035510cbc8fb331b45574ea74d4a01e4af0a706c1a84656d8b8d6e60f518b2ea75fa27361ea
 DIST mu-1.6.6.tar.xz 866724 BLAKE2B 3417d4b3e5bfae943558fbc936ca0207be912f9548621b1599437484e94f3b49271aa1e97e7cc2b5b6027b8e0cf97d3b96d2052772f7783d897b4fa0dcf03184 SHA512 07daf9864bfd1ff4278aee98a0ae9c4fc3be94468e3b2022ae801f048f339b5becdb9ad8ebb2e12b9131e0e6dfcfb541bdca8288657dc19d47b0e510831f54eb
-EBUILD mu-1.6.1.ebuild 1389 BLAKE2B ffaaa365678a15bb5c7bd38e1a0026175af64402ebdd8dfcf6912042999d9939091c0b76a071dfd174bb886e9c028e2d571fa1ee7933ce6b45b91358faad4a2a SHA512 3a1cb5891cb864503718de657b0d9a3078c25678955a59b9181c068459cfa045aaa973442e2bc33e75f8ea0a36c8206f58926e31f0c834d5a70f4c387a5532a3
-EBUILD mu-1.6.3.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-EBUILD mu-1.6.5.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-EBUILD mu-1.6.6.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-MISC metadata.xml 926 BLAKE2B 14f872d6b63bbb9547b44759bca864546e040ebe1e4a9b8d3bc827e39251a1166cf893aa80926ff33949d9039f755cb9a68075ab1efbca820bbacce5972a8818 SHA512 bd0b0fe8182aefb2a8feb9dde074aa4d8b5a700914e318a9982cf696a72ff38e5ca8d9c8b600f31d3ff618fc5a87cd7a964d0dc55ef5d082bbee23040e69d0af
+DIST mu-1.6.7.tar.xz 867136 BLAKE2B 12b19d15c01a7101e3a936b12ee87fa5519c0e047e354f2fd1d481939dd5dffa34a94a5e7f3fda20e27771377e78524065cf5f93f7a2f818e202cdc93090ebff SHA512 ceae7b4508fc607dcda0fc20e9fb92b3533b1ba7ef94823cba2cd3a6ad3f18ccd3d2ea7da20e4c190e53f2d00ccdd3e1d25e12b89a08bf5233f5656be90b3c14
+EBUILD mu-1.6.6.ebuild 1362 BLAKE2B ca704ccd04361f92723d13c12a9a97f744ad2715f79a406b1dd40848984a7ff256aa73f9e8c8656c7ca67b51a7a699ccce366ff0c2e5dc9a6cbbc57dce27219a SHA512 05b1a606d2821b1cfbd65e3c6377e30d82ae1d6878e276685d70e7b76d80183d14292d6131c3e28d4f1a4f59c80234bc1e41cb5092dfcdceb1e88c243047c7a5
+EBUILD mu-1.6.7.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
+MISC metadata.xml 853 BLAKE2B 3439781265eac626261d1717e8ebf8a34a9263b4eaabd37f3a886d1c563c2ae539051741c84b47e8621dfe4513e5213248ba8bcac35dc846bb8676ef5b7239a3 SHA512 4f602ca074a2456393de9394a66de51000351022ef3ad19dd0a2e95d00b70c538f9d96042a979e9e7f714ea9441ca3c52503a4018b15534e0abf1d8a55c7534e
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 9bbd2af15171..a47ba60ed555 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -15,7 +15,6 @@
 	</longdescription>
 	<use>
 		<flag name="emacs">Install the mu4e mail client</flag>
-		<flag name="mug">Install the mug toy client, not for normal use</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">mu0</remote-id>
diff --git a/net-mail/mu/mu-1.6.1.ebuild b/net-mail/mu/mu-1.6.1.ebuild
deleted file mode 100644
index 6724af7d5012..000000000000
--- a/net-mail/mu/mu-1.6.1.ebuild
+++ /dev/null
@@ -1,63 +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 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
-}
diff --git a/net-mail/mu/mu-1.6.5.ebuild b/net-mail/mu/mu-1.6.5.ebuild
deleted file mode 100644
index 94eaeb52fa23..000000000000
--- a/net-mail/mu/mu-1.6.5.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.6.ebuild b/net-mail/mu/mu-1.6.6.ebuild
index 94eaeb52fa23..d61ad8bf9f92 100644
--- a/net-mail/mu/mu-1.6.6.ebuild
+++ b/net-mail/mu/mu-1.6.6.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 arm arm64 x86 ~x64-macos"
 IUSE="emacs guile readline"
 
 DEPEND="
diff --git a/net-mail/mu/mu-1.6.3.ebuild b/net-mail/mu/mu-1.6.7.ebuild
index 94eaeb52fa23..94eaeb52fa23 100644
--- a/net-mail/mu/mu-1.6.3.ebuild
+++ b/net-mail/mu/mu-1.6.7.ebuild