gentoo resync : 09.07.2022

6 files changed, 6 insertions, 227 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 08fe22939479..86987d61673c 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,12 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-AUX mu-1.7.12-gcc12.patch 279 BLAKE2B 6b193a92ffbb3d126d39b45c09c4ccc971fe362af9e2621fc6e21e5e697d376f3a21c8e7f3521340d169ba572f9ad857bcd2ef69917650a5e5be0c99fef3aa31 SHA512 59887f801811bc86de2a562ab93304887725421baf7cf878c33bd5bc3b12eca68db951008899b18050c9b597580bc98f676881e58aafdda4af49d20e2fc64d45
-AUX mu-1.7.12-optional-mu4e.patch 1047 BLAKE2B a951fe687e59dc6cfd4266c3c3f18aa6a80e562f3bcd617526fc14c8c076768cff444d683a016100e829d6ee80c11d4701db62bcec3a13e28b40ef9b0d1505fe SHA512 3f79f0c8591170231ca800e6fd4476fa1475aea18ec5b1f6c035c88f6b947755527cfa6674a0b221cbae7808e4841b03aed8bbf56b71f2b68d84fe9c2562c363
 DIST mu-1.6.10.tar.xz 867008 BLAKE2B 6cce22f18691c3ad6dda1ec012d72c398df2ba4d1beca70fc6f88d87aa9b749e2aa4c03f5c0e0d70f4f9978e2beb60ea02642b8ff71e86e0668df726e5923b52 SHA512 a51847b338afeff9c9fa88c4698df4b85289d017063cb5e3410eb967c605d8779618dcbd988e2d923a92291c1e0738ec84afecf017c76a63776149619d134887
-DIST mu-1.6.11.tar.xz 870188 BLAKE2B ec2ab4312800e8357b4fc902251708e27968cdde389e2403fca9ad6b1ef5e00154aa018d5a7751ec5372b5ca2be2eb030a9148c0d53f35040f420877d51ca3f3 SHA512 78faa4f9b34827676203ab305797deb96c0c0f9b0e8158e627c9a992bccd9c5708d4a1f5cc93c0b9c7f9a224b047800bd389bf3fceb163aa139ecff0cfa19274
-DIST mu-1.7.23.tar.xz 2136016 BLAKE2B 9b0a27fc07072e52c06d8d4b807a77491d314d4c531799a83b1281ce935b79f5eab3510dc94be98ee0effe86c69379331172cfea3db330b8302d03582f7bf364 SHA512 412789146e4962f670c356576906e5eabc5783dd0fc7d04440146f064877f53b4e948713ed557e97b114a96d7a41b3087a8e3c528b48bb363e68fd0eabfe42fc
-DIST mu-1.8.1.tar.xz 537892 BLAKE2B dda0cdd3a45572000861557b04d8c92c0d61c283c6ace69a034ce209d22dc7e26ea4ac77c6493c505e0c7bcbf47ace82cd82ab20295170b2a986fcccaa0c5df9 SHA512 01b4c349aecf4134c700b6e4b1bc58d1e1360a74feec3f3ee56d1f350c7640b7447bdc35f158ce892427b7b7fbe15cfb00ab28d5aa05b9eaba1d4b4f32e5ed26
+DIST mu-1.8.5.tar.xz 539368 BLAKE2B 6efc12f82aab2beee86475ee49492ce59cb70e8b4fa63f2099a6071ec3275e7f0f308a868133ab3be4646d2280f720a4f6bb5673563a4437d2135e149b1cdfac SHA512 f43afb9484937077f32a38f347352b1ec8fb74c85be74f3afdd53ff75b965f42ab88daa58433fd9292a10c69ed2f2daf3ddbaf3d8d5d5595b0b29b81629a846f
 EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
-EBUILD mu-1.6.11.ebuild 1590 BLAKE2B ab43c3330249f7fb9175dcb4f4e47a679efac9491ff184fed07e50e107e0eb73a1e95d269eec56b32fb13ab753ebc0daf884a6a812bc93af1afad204fec19a58 SHA512 1b3f0ba75c9baf1761cb853a2c2142137bceed8b106914b19b9598e0bc7c4644b5f8a5000be793d9f6eb3c4818dc9a777169e77b7e1b6dbfc48b48b3619ba01e
-EBUILD mu-1.7.23.ebuild 2073 BLAKE2B 5f0eae7568d09af9d62a8475c056a0f74b96517372a46cdf81538f1a43bffdfc75fc813cb086cc6f876a2b099e9bdef247e47e54ea9b0868c926e92e3a8497ab SHA512 56cf8c574b242910c1d787bae63ed04bfdf03298f27852baa373b599b087da8816035b55507f29665192f5fc7cb8c8a43cedd6dbcd2f68c9baff6f5522bd5af1
-EBUILD mu-1.8.1.ebuild 2043 BLAKE2B 2122817aade6a310834d42c3f2720424a1506c13497f063794a95b5cd1eca05a0601fb16db335698523e4620bf7d7a2393560cf6fd577210b6646e7a7e32d63b SHA512 a3130bbcafaa38c64168ec87ef82fd23bfb5a2dc83b9b2e8e1de8d3a6ae90aa732fe6d58cfcdc840e0ad634544ea3b2bde6a9148c3ccfa5b0a30b3387134be40
+EBUILD mu-1.8.5.ebuild 2103 BLAKE2B 3def0840baba20487d6256076c9327c2762cca569af1e1c48589ee7308569f20e88aa32245b449eca9416dc4f819937f1720a0c569799d7ae29cbc7b595eb07a SHA512 f24cb94e4c8d62559a5ef824472d2684ff7b8a5239c9112c8bace36a4df6c0c38089a707bf9138928b874ef445165efd5e18bca644659fb140f1a90abb548459
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/files/mu-1.7.12-gcc12.patch b/net-mail/mu/files/mu-1.7.12-gcc12.patch
deleted file mode 100644
index f360351e17f4..000000000000
--- a/net-mail/mu/files/mu-1.7.12-gcc12.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://github.com/djcb/mu/pull/2224 (rebased)
-https://bugs.gentoo.org/839918
---- a/lib/utils/mu-utils.cc
-+++ b/lib/utils/mu-utils.cc
-@@ -32,6 +32,7 @@
- #include <string.h>
- #include <iostream>
- #include <algorithm>
-+#include <functional>
- #include <numeric>
-
- #include <glib.h>
diff --git a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
deleted file mode 100644
index 0f14bf3249e2..000000000000
--- a/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 41e262b51968359074faac21fa80d2f1237c57cf Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Sat, 2 Apr 2022 10:06:21 +0100
-Subject: [PATCH] build: add emacs option
-
-Without this option, mu4e will always be installed when Emacs is
-installed.
----
- meson.build       | 2 +-
- meson_options.txt | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 58ac9002..5f71d766 100644
---- a/meson.build
-+++ b/meson.build
-@@ -174,7 +174,7 @@ subdir('lib')
- subdir('mu')
- subdir('man')
- 
--if emacs.found()
-+if get_option('emacs').enabled() and emacs.found()
-    subdir('mu4e')
- endif
- 
-diff --git a/meson_options.txt b/meson_options.txt
-index 0c70826e..34cb0c02 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -29,3 +29,8 @@ option('readline',
-        type: 'feature',
-        value: 'auto',
-        description: 'enable readline support for the mu4e repl')
-+
-+option('emacs',
-+       type : 'feature',
-+       value: 'disabled',
-+       description: 'build mu4e')
--- 
-2.35.1
-
diff --git a/net-mail/mu/mu-1.6.11.ebuild b/net-mail/mu/mu-1.6.11.ebuild
deleted file mode 100644
index 311a0e76b0b5..000000000000
--- a/net-mail/mu/mu-1.6.11.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 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[@]}"
-}
-
-src_test() {
-	# On some systems make -n errors out so the default src_test
-	# implementation does not call the tests.  Bug #836782
-	emake test
-}
-
-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/mu/mu-1.7.23.ebuild b/net-mail/mu/mu-1.7.23.ebuild
deleted file mode 100644
index 39d5cb8ad147..000000000000
--- a/net-mail/mu/mu-1.7.23.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-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://dev.gentoo.org/~matthew/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
-	"${FILESDIR}"/${PN}-1.7.12-gcc12.patch
-)
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature emacs)
-		$(meson_feature readline)
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-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.8.1.ebuild b/net-mail/mu/mu-1.8.5.ebuild
index ef60bb7e559f..af673005c01c 100644
--- a/net-mail/mu/mu-1.8.1.ebuild
+++ b/net-mail/mu/mu-1.8.5.ebuild
@@ -26,10 +26,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
-)
-
 SITEFILE="70mu-gentoo-autoload.el"
 
 src_prepare() {
@@ -39,14 +35,17 @@ src_prepare() {
 	sed -i '/NEWS.org/,+1 d' meson.build || die
 	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
 
+	# Don't compress the info file.
+	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
+
 	# Instead, put it in /usr/share/doc/${PF}.
 	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
 }
 
 src_configure() {
 	local emesonargs=(
-		$(meson_feature emacs)
 		$(meson_feature readline)
+		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
 		# NOTE: Guile interface is deprecated to be removed shortly.
 		-Dguile=disabled
 	)