gentoo resync : 10.09.2021

5 files changed, 13 insertions, 177 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 576c3ebd0df5..bc88779941ee 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,15 +1,12 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 AUX mu-1.4.15-guile3-1.patch 5237 BLAKE2B 49fb8d7c75d0dc758b7a0cc4d69fca9a1d776c522037271e985b8667c82e04b5487a9a3f4a0537a1aaf81950f95e06e258abc79a1b9d572f8a9cce4144d883b1 SHA512 ca2a06e604ea86b24f5f11d1901ab27dfd54346c4cc9417ae95ac9d0472e4f0e1bf3aad638cc06d8b354339defbbd5972096b563d362c0d23265ae60e1e0790c
 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
 DIST mu-1.6.3.tar.xz 867224 BLAKE2B dffe67df4731028fa5e77d62d32fb787639b25d43a48aaac0c0e446c14cd3c5f79ad5559968446603782f1a7df9c129b2c3e1c3576e01d162a59693a2abd960e SHA512 73bfc85561cbc31d8c8ba6043ad79b7c17ac33edbbfcb3f09d460b291454c7696b282ee98c7738e05a9842963169c3f87eff56c3f6729cb22cdb6136ae8b95e3
 DIST mu-1.6.5.tar.xz 867240 BLAKE2B d3e8ad88b38f1329e4a5716f981c97e62c2042835e81910dab02b1219abfc670fe84a68f992fd08dce282a3288aaa91a465ce881f79e7ece917ba089c2ad0348 SHA512 b25203d281fa43b22abacb442caa56d797489d32bfc1dde874d23035510cbc8fb331b45574ea74d4a01e4af0a706c1a84656d8b8d6e60f518b2ea75fa27361ea
-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 1390 BLAKE2B cb26858bd482421b2e4ba05d562f0d0d03fd6bf33a965574947d8c304a5edef6ee48a430b8f9b088e9b31f4161ff36483a93fb495a657b484aa6a8ad87ea489e SHA512 4929825e1ec32756827b22ed694ee74bf45137f793e66aacd95c0df8023d7413e0d2d436ba71cf7d4463e449b085a107195de3ff4b3116f04ee905b4483cec56
+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 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3
diff --git a/net-mail/mu/mu-1.4.15-r2.ebuild b/net-mail/mu/mu-1.4.15-r2.ebuild
deleted file mode 100644
index fa8dc2e30146..000000000000
--- a/net-mail/mu/mu-1.4.15-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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/archives/refs/tags/${PV}.tar.gz -> mu-${PV}.tar.gz"
-
-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:=
-	emacs? ( >=app-editors/emacs-24.4:* )
-	guile? ( >=dev-scheme/guile-2.2:* )
-	mug? (
-		net-libs/webkit-gtk:4=
-		x11-libs/gtk+:3=
-	)"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.15-guile3-1.patch
-	"${FILESDIR}"/${PN}-1.4.15-guile3-2.patch
-)
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-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.4.15.ebuild b/net-mail/mu/mu-1.4.15.ebuild
deleted file mode 100644
index dd311566d5bd..000000000000
--- a/net-mail/mu/mu-1.4.15.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-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:=
-	emacs? ( >=app-editors/emacs-24.4:* )
-	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_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable emacs mu4e)
-		$(use_enable mug gtk)
-		$(use_enable mug webkit)
-		$(use_enable guile)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	dobin mu/mu
-	dodoc AUTHORS HACKING NEWS NEWS.org TODO README ChangeLog
-	if use emacs; then
-		elisp-install ${PN} mu4e/*.el mu4e/*.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		doinfo mu4e/mu4e.info
-	fi
-
-	doman man/mu-*.*
-
-	if use guile; then
-		  doinfo guile/mu-guile.info
-	fi
-
-	if use mug; then
-		  dobin toys/mug/mug
-	fi
-}
-
-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.1.ebuild b/net-mail/mu/mu-1.6.1.ebuild
index 70d1fb815cfa..6724af7d5012 100644
--- a/net-mail/mu/mu-1.6.1.ebuild
+++ b/net-mail/mu/mu-1.6.1.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 mug"
 
 DEPEND="
diff --git a/net-mail/mu/mu-1.4.15-r1.ebuild b/net-mail/mu/mu-1.6.6.ebuild
index b8cc4a02fef0..94eaeb52fa23 100644
--- a/net-mail/mu/mu-1.4.15-r1.ebuild
+++ b/net-mail/mu/mu-1.6.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit elisp-common
 
@@ -12,18 +12,15 @@ 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"
+IUSE="emacs guile readline"
 
 DEPEND="
-	dev-libs/glib:2=
-	dev-libs/gmime:3.0=
+	dev-libs/glib:2
+	dev-libs/gmime:3.0
 	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-24.4:* )
+	emacs? ( >=app-editors/emacs-25.3:* )
 	guile? ( >=dev-scheme/guile-2.2:* )
-	mug? (
-		net-libs/webkit-gtk:4=
-		x11-libs/gtk+:3=
-	)"
+	readline? ( sys-libs/readline:= )"
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -32,9 +29,10 @@ SITEFILE="70mu-gentoo-autoload.el"
 src_configure() {
 	local myeconfargs=(
 		$(use_enable emacs mu4e)
-		$(use_enable mug gtk)
-		$(use_enable mug webkit)
 		$(use_enable guile)
+		$(use_enable readline)
+		--disable-gtk
+		--disable-webkit
 	)
 
 	econf "${myeconfargs[@]}"