commit: 0b431dccdf03acf519655b8bc25e9c5a7e0f4023 Author: Matthew Smith <matthew <AT> gentoo <DOT> org> AuthorDate: Sat Jul 9 10:16:20 2022 +0000 Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> CommitDate: Sat Jul 9 10:16:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b431dcc
net-mail/mu: drop 1.6.11, 1.7.23, 1.8.1 Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> net-mail/mu/Manifest | 3 - net-mail/mu/files/mu-1.7.12-gcc12.patch | 12 ---- net-mail/mu/files/mu-1.7.12-optional-mu4e.patch | 41 ----------- net-mail/mu/mu-1.6.11.ebuild | 71 ------------------- net-mail/mu/mu-1.7.23.ebuild | 90 ------------------------- net-mail/mu/mu-1.8.1.ebuild | 89 ------------------------ 6 files changed, 306 deletions(-) diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 0cb493566cce..310a8ae6a212 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,5 +1,2 @@ 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 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 <[email protected]> -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.1.ebuild deleted file mode 100644 index ef60bb7e559f..000000000000 --- a/net-mail/mu/mu-1.8.1.ebuild +++ /dev/null @@ -1,89 +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://github.com/djcb/mu/releases/download/v${PV}/${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 -) - -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 -}
