diff options
author | 2022-05-27 10:21:41 +0200 | |
---|---|---|
committer | 2022-05-27 10:21:41 +0200 | |
commit | 9bfecba0de583e16c63295a9f49b4e728e47a130 (patch) | |
tree | f53c6d90f62106e0ee44a9b3af0cb12d2ccabee3 | |
parent | sys-kernel/gentoo-sources: upgrade v4.9.76-r1 and v5.4.38 to EAPI 8. (diff) | |
download | AstroFloyd-9bfecba0de583e16c63295a9f49b4e728e47a130.tar.gz AstroFloyd-9bfecba0de583e16c63295a9f49b4e728e47a130.tar.bz2 AstroFloyd-9bfecba0de583e16c63295a9f49b4e728e47a130.zip |
net-mail/mu: version bump to v1.7.13.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: AstroFloyd <AstroFloyd@gmail.com>
-rw-r--r-- | net-mail/mu/ChangeLog | 7 | ||||
-rw-r--r-- | net-mail/mu/Manifest | 10 | ||||
-rw-r--r-- | net-mail/mu/files/mu-1.7.12-gcc12.patch | 12 | ||||
-rw-r--r-- | net-mail/mu/files/mu-1.7.12-optional-mu4e.patch | 41 | ||||
-rw-r--r-- | net-mail/mu/mu-1.2.ebuild | 78 | ||||
-rw-r--r-- | net-mail/mu/mu-1.3.1.ebuild | 78 | ||||
-rw-r--r-- | net-mail/mu/mu-1.7.13.ebuild | 86 |
7 files changed, 151 insertions, 161 deletions
diff --git a/net-mail/mu/ChangeLog b/net-mail/mu/ChangeLog index 60a6de6..fd84854 100644 --- a/net-mail/mu/ChangeLog +++ b/net-mail/mu/ChangeLog @@ -1,3 +1,10 @@ +*mu-1.7.13 (27 May 2022) + + 27 May 2022; AstroFloyd <AstroFloyd@gmail.com> +files/mu-1.7.12-gcc12.patch, + +files/mu-1.7.12-optional-mu4e.patch, +mu-1.7.13.ebuild, -mu-1.2.ebuild, + -mu-1.3.1.ebuild: + net-mail/mu: version bump to v1.7.13. + 19 Jul 2019; AstroFloyd <AstroFloyd@gmail.com> mu-1.3.1.ebuild: net-mail/mu: fix typo diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 1163169..381f5a6 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,7 +1,7 @@ AUX 70mu-gentoo.el 76 BLAKE2B 478ebba49409f7b1fd601e4c6019cb9da7cc8c6f9b4f7318155225fa84ebd82cb73ba79637c0aa2dda9d9779e525b0577bc940a0d613a3fa64031e35f3178a46 SHA512 61cc2bf611a0d1f2aa53b4624c52e1aa9672a81b4b8d7386aad1bf70b0b0db6ee19e011acc5a1a28b220d99eb3683140a2ff02dc3e01ea68f512ee05ec7bc23e -DIST mu-1.2.tar.gz 2297571 BLAKE2B 79e6ab6bfcc62d30837f90fdb84e66b537262ba322c72621eff41aa20ae8462256efe8f605d727b84ff2103edd8ee02b26e4d5311802f377ba901ed44cee6005 SHA512 eadebbaf2d6b6c604c9cebc72621fe64bd4fa7b793d02b0a029a3e970c076430e2067a05ab215652f9fc52e77e4e80401476ca5b39b294eb0b14d9082118d99a -DIST mu-1.3.1.tar.gz 2297142 BLAKE2B c3979920a3ec4df0117576610e752cd18c32df93b7dd412670740c6b966e3d343a5df211b974896e2b79dd7502031e7a1fa6adf8ee2e3e500b211ee7d0385bad SHA512 95a7cdd2a7e01d7b2112c87458ab51a528ead21c75ab6d00e22b52a207cb3bbddb0a739bceb0021a3cc528fcc47863dfedaf28d4ff737217f6bc15636c972a43 -EBUILD mu-1.2.ebuild 1966 BLAKE2B ab3594b25420c54b77fc9773da84295c266f3d54e3803ca344c189c4d8ddd8ff06cf22325dd64e7c5b9eda203bd2180aa8cb67c1e0740cfcb306560e3c37aff1 SHA512 7ba4559263cc4995f9c5270d93ea2c5c4c24b43e82e84e68816fda19c46e1980364ff42f11586695482a2aa0674214b65e7217362fac4ba24d9d1516bfaab0eb -EBUILD mu-1.3.1.ebuild 1966 BLAKE2B fb00daf9288a48c06a8728ee37697a6b7d280ce21cf677a040ddfe619d5f437108dfb2e3597dc0e94b34f3d882446530d1f6764c24082cfa9e149d6f10468d49 SHA512 4232c8b187011cee34f5d157f90a4de47975ca9dadd14a6fe179761ec97203595eacc54a81bfddf79b1050b681e1f8cd264936d5e66f2c1e274a3947362b85c9 -MISC ChangeLog 333 BLAKE2B 3c42108bd8e3e201c25324da3cc91df79a4d2a5850460c842021048192158fd9a14d181c831d23d686e13eb8cddf0d83d168d9be5662e773b98e3ef5519e6255 SHA512 c230387bb98e2ac655adfbe180e4edb1be3777d8d153255a2d77c497ab9a03a77c79f5d0346dbf443d00aa8cbf48b1560945913a892cd3289f25ec5e00c4ae45 +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.7.13.tar.xz 2139140 BLAKE2B c5eea94df8640e0362fd7bd18da78cc53023e7c85c3b4a653df7ae52e57dc64433572bfb2bc41494ce60a1b26abdd75ee07cb945a282754a12f65835a4545e6d SHA512 c5c447cdcf6fd2a3c3dfb8c7cffc9c50e147de2779db04fedaf59897fd135a76b309576f2c9473919221f0dcd6b8793732af3483d86dbe0f073a66d2559fe315 +EBUILD mu-1.7.13.ebuild 1942 BLAKE2B c708aa3c6c104199eb7dad3d1b1c80337236549446fc4401fdf916be5dfa6b5b48888577253dd7a873247251827091ac0f69795abe12dfa79ea437044a984d9f SHA512 77c977665deea2fc90f75e672e99fda1dc1c710dabc8cb946ccfcda01bd8cb6a7bfc090883dc01817c1f5ac787cf84563801f564f49a83ae684628ec9f7d24c9 +MISC ChangeLog 574 BLAKE2B 6afafd5ef63d4bae7367e5e8223c037fd3ec5010c8b16a692ad2a1ecda90d0a93ada6c5418f1748b34a6d76ae00631fc39f91455d550e191ebf83b1fc4f96ff6 SHA512 689cea80e13a20312f6f0958a1cfb0adbbae700a2b3c91362c30fe7fc6ca11d36c147bf45f6af8520048e43eee496e5bbf148b5da784b6a5f9e595a3250b54b2 MISC metadata.xml 630 BLAKE2B 0a24656b86c87b2af1d9b00fc8be0fdccaa2fa28d6b1d8a4146b3d4df7a9edfa3934b28f54615115e1369da32b10e52fefc9ede45b5b59e4c5055d43f797427b SHA512 644b98b1c92e4a8b3e51a9d75d815869f84908aa0fd434c6ac24ca327820e6a2eed31013351a89f33aac9a8a0db91636e8912e5b0417556b45d888e3b1b7ac62 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 0000000..f360351 --- /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/files/mu-1.7.12-optional-mu4e.patch b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch new file mode 100644 index 0000000..0f14bf3 --- /dev/null +++ b/net-mail/mu/files/mu-1.7.12-optional-mu4e.patch @@ -0,0 +1,41 @@ +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.2.ebuild b/net-mail/mu/mu-1.2.ebuild deleted file mode 100644 index 537cc1b..0000000 --- a/net-mail/mu/mu-1.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools elisp-common - -DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" -HOMEPAGE="http://www.djcbsoftware.nl/code/mu/" -SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="emacs" - -# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody -# really wants both installed at the same time. -DEPEND=" - dev-libs/gmime:2.6 - dev-libs/xapian - dev-libs/glib:2 - emacs? ( >=virtual/emacs-23 ) - !net-mail/mailutils" -RDEPEND="${DEPEND}" - -SITEFILE="70mu-gentoo.el" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable - # Note: --disable-silent-rules is included in EAPI-5 - econf --disable-guile \ - --disable-gtk \ - --disable-webkit \ - $(use_enable emacs mu4e) -} - -src_install () { - dobin mu/mu - dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog - if use emacs; then - elisp-install ${PN} mu4e/*.el mu4e/*.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - doinfo mu4e/mu4e.info - fi - # TODO: Add guile man page when guile-2 is available. - doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \ - man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \ - man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \ - man/mu-view.1 man/mu.1 -} - -src_test () { - # Note: Fails with parallel make - emake -j1 check -} - -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 "http://www.djcbsoftware.nl/code/mu/mu4e/" - fi - - elog "If you upgrade from an older major version," - elog "then you need to rebuild your mail index." - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-mail/mu/mu-1.3.1.ebuild b/net-mail/mu/mu-1.3.1.ebuild deleted file mode 100644 index bf81321..0000000 --- a/net-mail/mu/mu-1.3.1.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools elisp-common - -DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" -HOMEPAGE="http://www.djcbsoftware.nl/code/mu/" -SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="emacs" - -# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody -# really wants both installed at the same time. -DEPEND=" - dev-libs/gmime:3.0 - dev-libs/xapian - dev-libs/glib:2 - emacs? ( >=virtual/emacs-23 ) - !net-mail/mailutils" -RDEPEND="${DEPEND}" - -SITEFILE="70mu-gentoo.el" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # Todo: Make a guile USE-flag as soon as >=guile-2 is avaiable - # Note: --disable-silent-rules is included in EAPI-5 - econf --disable-guile \ - --disable-gtk \ - --disable-webkit \ - $(use_enable emacs mu4e) -} - -src_install () { - dobin mu/mu - dodoc AUTHORS HACKING NEWS NEWS.org TODO README README.org ChangeLog - if use emacs; then - elisp-install ${PN} mu4e/*.el mu4e/*.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - doinfo mu4e/mu4e.info - fi - # TODO: Add guile man page when guile-2 is available. - doman man/mu-add.1 man/mu-bookmarks.5 man/mu-cfind.1 man/mu-easy.1 \ - man/mu-extract.1 man/mu-find.1 man/mu-help.1 man/mu-index.1 \ - man/mu-mkdir.1 man/mu-remove.1 man/mu-server.1 man/mu-verify.1 \ - man/mu-view.1 man/mu.1 -} - -src_test () { - # Note: Fails with parallel make - emake -j1 check -} - -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 "http://www.djcbsoftware.nl/code/mu/mu4e/" - fi - - elog "If you upgrade from an older major version," - elog "then you need to rebuild your mail index." - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} 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 0000000..902c7c8 --- /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 +} |