gentoo resync : 12.05.2022

6 files changed, 119 insertions, 5 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index c11b2b85dea5..fa0b19f0045c 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,7 +1,10 @@
 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.7.12.tar.xz 2129072 BLAKE2B 3518a361bc06b632899f9296ec211dc926a07973433247bf6f9ecfb069dcfd8b762f358aa32418276bf7dcba40bad768dd4599534613a1fae285cef9c6ceedd0 SHA512 fe0f41520959df7f78525317bf5caad4ae7f7468ac6291b84c48805e133883192458a8f79a929c0ebda2e45ec2014db1aa72650d0a6e176d7678449be36fc4f2
-EBUILD mu-1.6.10.ebuild 1440 BLAKE2B 3e3c39a2691959ac6502772a4543d87d1cf1c9feaf1b2c8d44a2459f782236fa6c96fb42c59e8aa7c409352060a5b5a85361d203f71b810094491cc7bfd2b6a8 SHA512 42341654db5689f0fbecbce749e8653ccdcaf25d7dacd69d531a56ef3782e1ee0f12e307c28cfb8cdac1b749220770a14919476c4663ab0c392f766c146f4909
-EBUILD mu-1.7.12.ebuild 1901 BLAKE2B ab507df29e0b46eaf1ad2c4ac61f427a53a1430ef2f5885cacae6ee8d0fc9229ca6958522e51e25ae3bef5b4524878e01d825f3f54f59c525be219bc208f81e7 SHA512 2123a67149d7651475e52b9009bed1e731ef6037af0ff3fac45bffebcf833671bf1a5d2e3da2a5c4033c91d63161b6cb230b362987ed6bc4eb7aefd8efd62cb0
-MISC metadata.xml 784 BLAKE2B ee051513b24805053b4d278d1fe47df2ec0e05458283255dd55efa03b49462b3408ea8b9c4e9b21c7a1b13a00610f5af5f9db504774ed48f8c7dfb97542ffab4 SHA512 98e2efef7b28b462f8c62b053c27d40a624a886d3d813bc2e8e795db01332ae4d7ac7981759f2ac808a6ba238a5705e4834711f3ac7a2248d2824dc3a46df17c
+DIST mu-1.7.13.tar.xz 2139140 BLAKE2B c5eea94df8640e0362fd7bd18da78cc53023e7c85c3b4a653df7ae52e57dc64433572bfb2bc41494ce60a1b26abdd75ee07cb945a282754a12f65835a4545e6d SHA512 c5c447cdcf6fd2a3c3dfb8c7cffc9c50e147de2779db04fedaf59897fd135a76b309576f2c9473919221f0dcd6b8793732af3483d86dbe0f073a66d2559fe315
+EBUILD mu-1.6.10.ebuild 1586 BLAKE2B d14b3421814913a85460439407fb4fc90b9537df3132520c64697a20b5b3f35fc8c658395a36d4fabf514da9964333969c4e86d1092866cc6d033732d836a168 SHA512 465f3afbb8e522ce51404d6f0de08984b680498fe322484bec0f9dd2a5740fc4405ea69a78d081d9e07fcc26520c50e3349706d830c8cc2fb5dd4539f719c15a
+EBUILD mu-1.7.12.ebuild 1942 BLAKE2B c708aa3c6c104199eb7dad3d1b1c80337236549446fc4401fdf916be5dfa6b5b48888577253dd7a873247251827091ac0f69795abe12dfa79ea437044a984d9f SHA512 77c977665deea2fc90f75e672e99fda1dc1c710dabc8cb946ccfcda01bd8cb6a7bfc090883dc01817c1f5ac787cf84563801f564f49a83ae684628ec9f7d24c9
+EBUILD mu-1.7.13.ebuild 1942 BLAKE2B c708aa3c6c104199eb7dad3d1b1c80337236549446fc4401fdf916be5dfa6b5b48888577253dd7a873247251827091ac0f69795abe12dfa79ea437044a984d9f SHA512 77c977665deea2fc90f75e672e99fda1dc1c710dabc8cb946ccfcda01bd8cb6a7bfc090883dc01817c1f5ac787cf84563801f564f49a83ae684628ec9f7d24c9
+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
new file mode 100644
index 000000000000..f360351e17f4
--- /dev/null
+++ b/net-mail/mu/files/mu-1.7.12-gcc12.patch
@@ -0,0 +1,12 @@
+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/metadata.xml b/net-mail/mu/metadata.xml
index e4a573847070..6df1a2d14725 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -8,6 +8,10 @@
 	<maintainer type="project">
 		<email>gnu-emacs@gentoo.org</email>
 		<name>Gentoo GNU Emacs project</name>
+		<description>
+			For mu4e (installed with USE=emacs).
+			Do not assign for anything else.
+		</description>
 	</maintainer>
 	<longdescription lang="en">
 		'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
diff --git a/net-mail/mu/mu-1.6.10.ebuild b/net-mail/mu/mu-1.6.10.ebuild
index ce62a8d42dd1..7900e1384200 100644
--- a/net-mail/mu/mu-1.6.10.ebuild
+++ b/net-mail/mu/mu-1.6.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -38,6 +38,12 @@ src_configure() {
 	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
diff --git a/net-mail/mu/mu-1.7.12.ebuild b/net-mail/mu/mu-1.7.12.ebuild
index 02358e6b56c8..902c7c8d9e4b 100644
--- a/net-mail/mu/mu-1.7.12.ebuild
+++ b/net-mail/mu/mu-1.7.12.ebuild
@@ -26,7 +26,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.12-optional-mu4e.patch
+	"${FILESDIR}"/${PN}-1.7.12-gcc12.patch
+)
 
 SITEFILE="70mu-gentoo-autoload.el"
 
diff --git a/net-mail/mu/mu-1.7.13.ebuild b/net-mail/mu/mu-1.7.13.ebuild
new file mode 100644
index 000000000000..902c7c8d9e4b
--- /dev/null
+++ b/net-mail/mu/mu-1.7.13.ebuild
@@ -0,0 +1,86 @@
+# 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
+
+	# 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
+		-Dtoys=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
+}
+
+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
+}