4 files changed, 2 insertions, 134 deletions
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 90cbe66a8552..ffd28e25defd 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,9 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
-AUX mu-1.8.13-add-cstdint-inc.patch 1158 BLAKE2B 6f8b7529c6a8b6f432303ee7aac811d66011f098a50b15817f83a397481af69045cd1558e0480be649f7781578fbbcced6c0dea1065e7b21d742041b3b29d61b SHA512 d7c2d43ceb92fbc509df0af4e0a97a993b9da15109ac7a9e7d05909d7ed2cb6e5dd8b2e2b9aadf56c1bbc83f5fb9e643db0f64daa6b1275e3be0016af8fedac1
-DIST mu-1.10.2.tar.xz 569692 BLAKE2B a75ad3d60806a5d336665b5dbc7d1f062928eff6fd2424651d3d85c4dd3134d1b4f912bd24120c14670dab49ef2e51056a0b130cc714edd0d56ab87bbdb7832b SHA512 2e8843846676c4f9ed9abb48bce8c52ffbfafcf1b7542c9f0663c2f5572c101871e935938f0406b284c6b78fb0fb190469d193151c5adbc50a10eea0edf76ccd
 DIST mu-1.10.3.tar.xz 569740 BLAKE2B bfd332d77a0c8727beeac363c35199dd8da0b4dde940981845865eda7e0ff7a7bfcbfef76509ca407bea80b4b148b0b6bce79fa928b2c4df239b55325336c049 SHA512 dbc3946b50791bb01e640d7c07a5072c4c6381b576337899c32b0f0c8331b44ab328f3887eacfff4d5ec71144164a43dc2c1241330bf00226748485027e7f21b
-DIST mu-1.8.14.tar.xz 543828 BLAKE2B d64e52a66f3b68a2d5b039eaff668c5ecf0da8b1e77719de49316cbe96bb9d34c3e4f8636cfd63cf473218ea6ec428f8c2be2d80c94d1b1456e4b7f17c5ab52c SHA512 8d5514cf08891180163e4d7caff7a3d75dd39a6397c0c8608a85b613f83a4f714f772400c2a057c1f9ef46dedd4f240828ced4e8a1b38ebe4340041059a3ad44
-EBUILD mu-1.10.2.ebuild 2120 BLAKE2B 7e459898c0d6b022af4e1aa66bd27504773f48a79c4e56ce613ce1ffd69dfd6eac069c1786aa3497470adf9bdf8b4fc532f382dd1e8e2bfe7db504a1f7cd4356 SHA512 58dc9e4ea1845802a41d7b429c89db289376152ac52140249f0e5e8f3047f342dcb8842c616b321550ea425da6fd1825507bca809ae08b61e2cd95d291d14f0d
+DIST mu-1.10.4.tar.xz 570024 BLAKE2B 81d0ea6ac018a24eaa9f80e21fdbd6f4e67faba1cf3d6f93721ac32caf1f820b03adfbee096229da95caf229f7dc3c8e78008654296fb684fdc62e0cffab590d SHA512 7c58ddf65c4aaa555d38c3a10ecf5d6e170ff2914515f8f1242ca59226bda09057bcbff2bc5459b448c34c3bd3add9546fd71387891f8eef8b2ee9aa738982e1
 EBUILD mu-1.10.3.ebuild 2116 BLAKE2B 4661e7d9a2bd195ef2dae29b60b3e7c21ec36fb9bf2f87c78048e7087905bd4264fc94153b5f727e3c05f912b4b1295983c4ae1dbe945be91a62060ee5056f69 SHA512 6c575416d7f4c3df3b7c077a90bbe81a41adb40448a82c3af2ceb7ae19d5e83c9d0535b0b39b43ffa04a5651c0a7950c4b59a903ece8a2e657e18c444a6705ef
-EBUILD mu-1.8.14.ebuild 2169 BLAKE2B 01445458f171ac1bc539ca9eaf864e9b68978728dea36cdf476a790e4c19bc539d4da42480e1873ae8d3d4abc1d2c4ede618985f854edc5b4857d6a151b4e1d1 SHA512 a40006f6380b5411263189f40f1f77ca8a74a3d42d232678b118e9d1320df3d0e84301bbdffeae1378a694cf871bac8800aad7231d0e2b735e171cfddd5e56b5
+EBUILD mu-1.10.4.ebuild 2120 BLAKE2B 7e459898c0d6b022af4e1aa66bd27504773f48a79c4e56ce613ce1ffd69dfd6eac069c1786aa3497470adf9bdf8b4fc532f382dd1e8e2bfe7db504a1f7cd4356 SHA512 58dc9e4ea1845802a41d7b429c89db289376152ac52140249f0e5e8f3047f342dcb8842c616b321550ea425da6fd1825507bca809ae08b61e2cd95d291d14f0d
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch b/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch
deleted file mode 100644
index 5b46732c805f..000000000000
--- a/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e0b17e4e31acd5657a3488936ef619c5ae2dc689 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sat, 21 Jan 2023 19:39:09 +0100
-Subject: [PATCH] mu-error: Add missing <cstdint> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 13s libstdc++ reduced its dependency on some headers like <cstdint>, so it's
-no longer transitively included through various headers.  Include it explicitly.
-
-See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
-
-  ../lib/utils/mu-error.hh:36:26: error: ‘uint32_t’ does not name a type
-     36 |         static constexpr uint32_t SoftError = 1 << 23;
-        |                          ^~~~~~~~
----
-https://github.com/djcb/mu/pull/2421
-
- lib/utils/mu-error.hh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/utils/mu-error.hh b/lib/utils/mu-error.hh
-index c67fc5a1..61923c6c 100644
---- a/lib/utils/mu-error.hh
-+++ b/lib/utils/mu-error.hh
-@@ -21,6 +21,7 @@
- #define MU_ERROR_HH__
- 
- #include <stdexcept>
-+#include <cstdint>
- #include "mu-utils-format.hh"
- #include "mu-util.h"
- #include <glib.h>
--- 
-2.39.1
-
diff --git a/net-mail/mu/mu-1.10.2.ebuild b/net-mail/mu/mu-1.10.4.ebuild
index 2acec2e5ddb5..2acec2e5ddb5 100644
--- a/net-mail/mu/mu-1.10.2.ebuild
+++ b/net-mail/mu/mu-1.10.4.ebuild
diff --git a/net-mail/mu/mu-1.8.14.ebuild b/net-mail/mu/mu-1.8.14.ebuild
deleted file mode 100644
index f04ccccfcf43..000000000000
--- a/net-mail/mu/mu-1.8.14.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 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://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv 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
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.13-add-cstdint-inc.patch
-)
-
-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
-
-	# 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 readline)
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# 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
-}