[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
commit: 6595e07cab120ebc8bc8804b8f090a6698d02315 Author: Matthew Smith gentoo org> AuthorDate: Mon Feb 26 14:39:49 2024 + Commit: Matthew Smith gentoo org> CommitDate: Mon Feb 26 14:39:49 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6595e07c net-mail/mu: fix build without python3 Avoid dependency on Python. Closes: https://bugs.gentoo.org/925503 Signed-off-by: Matthew Smith gentoo.org> net-mail/mu/files/mu-1.12.0-no-python.patch | 30 + net-mail/mu/mu-1.12.0.ebuild| 4 2 files changed, 34 insertions(+) diff --git a/net-mail/mu/files/mu-1.12.0-no-python.patch b/net-mail/mu/files/mu-1.12.0-no-python.patch new file mode 100644 index ..9840da22ca33 --- /dev/null +++ b/net-mail/mu/files/mu-1.12.0-no-python.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/925503 + +Call coreutils date instead of a Python script. +--- a/meson.build b/meson.build +@@ -104,17 +104,16 @@ cxx.check_header('charconv', required:true) + build_aux = join_paths(meson.current_source_dir(), 'build-aux') + + # derived date values (based on 'mu-date'); used in docs +-# we can't use the 'date' because MacOS 'date' is incompatible with GNU's. +-pdate=find_program(join_paths(build_aux, 'date.py')) ++date=find_program('date', required:true) + env = environment() + env.set('LANG', 'C') +-mu_day_month_year = run_command(pdate, mu_date, '%d %B %Y', ++mu_day_month_year = run_command(date, '-u', '+%d %B %Y', '--date', mu_date, + check:true, capture:true, + env: env).stdout().strip() +-mu_month_year = run_command(pdate, mu_date, '%B %Y', ++mu_month_year = run_command(date, '-u', '+%B %Y', '--date', mu_date, + check:true, capture:true, + env: env).stdout().strip() +-mu_year = run_command(pdate, mu_date, '%Y', ++mu_year = run_command(date, '-u', '+%Y', '--date', mu_date, + check:true, capture:true, env: env).stdout().strip() + + +-- +2.44.0 + diff --git a/net-mail/mu/mu-1.12.0.ebuild b/net-mail/mu/mu-1.12.0.ebuild index 4df4e56cb6e2..8152dc0b9a0e 100644 --- a/net-mail/mu/mu-1.12.0.ebuild +++ b/net-mail/mu/mu-1.12.0.ebuild @@ -27,7 +27,11 @@ BDEPEND=" " PATCHES=( + # https://github.com/djcb/mu/pull/2632 "${FILESDIR}"/${PN}-1.12.0-cld2-opt.patch + + # https://bugs.gentoo.org/925503 + "${FILESDIR}"/${PN}-1.12.0-no-python.patch ) SITEFILE="70mu-gentoo-autoload.el"
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
commit: c255fbdf7d080227e519d5bf4880f0834e7f8327 Author: Matthew Smith gentoo org> AuthorDate: Sun Feb 25 10:45:42 2024 + Commit: Matthew Smith gentoo org> CommitDate: Sun Feb 25 10:48:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c255fbdf net-mail/mu: add 1.12.0 Signed-off-by: Matthew Smith gentoo.org> net-mail/mu/Manifest | 1 + net-mail/mu/files/mu-1.12.0-cld2-opt.patch | 36 +++ net-mail/mu/mu-1.12.0.ebuild | 97 ++ 3 files changed, 134 insertions(+) diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index c8305cd99248..a166508e1851 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,3 +1,4 @@ DIST mu-1.10.6.tar.xz 570660 BLAKE2B 96816753a3b38392e7e943d8b72fd98b44d201c022b6018eb692cf594bd9f7285a84d00da53ab85a671d5375b7eafb9eb5a0e1fff51ad5a9b2d035fa1c0f8d23 SHA512 78eb5e21ac2dc2a6665a257593781c3b9a390644f78945ce9eef18acab6ca750b16773de2665a1ced9b2f9434b4a2879d07bc586b3abdb82ccc0cd3b59ab51e5 DIST mu-1.10.7.tar.xz 570740 BLAKE2B fcc1d3f6f293e2161e5bcef85eb085a3af95ff8d410e074f6a015f68e914592da171c357c795dad9d48ac8438e46f261b4f1be54d8f2e8075f93d72bd5a9a483 SHA512 0b588bb54ac79d23920150dbee7f7f7ca606d0fc8e169b2ca64a7cf0d062bb5c399c522d68f9bf6c3624addb8d9342efe0f45309d422eac3e3f8948acfebd904 DIST mu-1.10.8.tar.xz 570792 BLAKE2B 6e65e77544011d0f6b8fb1a5ac4dfe074fe6af3504e2ce2577185a280af43c8d40e7ec3ed6bde90c6b6c6b4cd678a6ae5bae9430f7c2a03451f3f08fffe1c963 SHA512 d77fe955c44c09272feb7cd903dfc6f2a3b5974b81fef82bdb553ed2079e68451bb1ed11ce338ee2dfe9be835f0d99cb4ce0c4b41f43ecfad76e978732243c71 +DIST mu-1.12.0.tar.xz 707400 BLAKE2B 05db6162b0662fb1fdf796d534abbfee8cd3f6359a9f74af10127d932c94e74abe736ef23c1535fc88faae0f23989548908c64b8165af2005b57f2f86bd2cde6 SHA512 349785803e72bc07f361412e282a42baf11c5f4b94a05ef0a13cec9311ac62cafaca10ffaa149574e2f1adb83fecfafb586554d1c2711dc16b53e67c03a01f6f diff --git a/net-mail/mu/files/mu-1.12.0-cld2-opt.patch b/net-mail/mu/files/mu-1.12.0-cld2-opt.patch new file mode 100644 index ..124675868670 --- /dev/null +++ b/net-mail/mu/files/mu-1.12.0-cld2-opt.patch @@ -0,0 +1,36 @@ +https://github.com/djcb/mu/pull/2632 + +--- a/meson.build b/meson.build +@@ -189,11 +189,11 @@ else + endif + + # optionally, use Compact Language Detector2 if we can find it. +-cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: false) +-if cld2_dep.found() ++cld2_dep = meson.get_compiler('cpp').find_library('cld2', required: get_option('cld2')) ++if not get_option('cld2').disabled() and cld2_dep.found() + config_h_data.set('HAVE_CLD2', 1) + else +- message('CLD2 not found; no support for language detection') ++ message('CLD2 not found or disabled; no support for language detection') + endif + + # note: these are for the unit-tests +--- a/meson_options.txt b/meson_options.txt +@@ -24,6 +24,11 @@ option('guile', +value: 'auto', +description: 'build the guile scripting support (requires guile-3.x)') + ++option('cld2', ++ type : 'feature', ++ value: 'auto', ++ description: 'Compact Language Detector2') ++ + # by default, this uses guile_dep.get_variable(pkgconfig: 'extensiondir') + option('guile-extension-dir', +type: 'string', +-- +2.44.0 + diff --git a/net-mail/mu/mu-1.12.0.ebuild b/net-mail/mu/mu-1.12.0.ebuild new file mode 100644 index ..4df4e56cb6e2 --- /dev/null +++ b/net-mail/mu/mu-1.12.0.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 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 +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.12.0-cld2-opt.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 + + # 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) + -Dcld2=disabled +
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
commit: 30e9c72612d623d7a48b4755a9426b2ddce3e51f Author: Arsen Arsenović gentoo org> AuthorDate: Sat Jan 21 19:08:11 2023 + Commit: Arsen Arsenović gentoo org> CommitDate: Sat Jan 21 19:52:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e9c726 net-mail/mu: Fix building on GCC 13 GCC 13s libstdc++ reduced its dependency on some headers like , 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; | ^~~~ Closes: https://github.com/gentoo/gentoo/pull/29210 Signed-off-by: Arsen Arsenović gentoo.org> net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch | 37 +++ net-mail/mu/mu-1.8.13.ebuild | 4 +++ 2 files changed, 41 insertions(+) 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 new file mode 100644 index ..5b46732c805f --- /dev/null +++ b/net-mail/mu/files/mu-1.8.13-add-cstdint-inc.patch @@ -0,0 +1,37 @@ +From e0b17e4e31acd5657a3488936ef619c5ae2dc689 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= +Date: Sat, 21 Jan 2023 19:39:09 +0100 +Subject: [PATCH] mu-error: Add missing 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 , 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 ++#include + #include "mu-utils-format.hh" + #include "mu-util.h" + #include +-- +2.39.1 + diff --git a/net-mail/mu/mu-1.8.13.ebuild b/net-mail/mu/mu-1.8.13.ebuild index 5e3b96704cf5..4a5365df91b8 100644 --- a/net-mail/mu/mu-1.8.13.ebuild +++ b/net-mail/mu/mu-1.8.13.ebuild @@ -26,6 +26,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/mu-1.8.13-add-cstdint-inc.patch" +) + SITEFILE="70mu-gentoo-autoload.el" src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
commit: 0b431dccdf03acf519655b8bc25e9c5a7e0f4023 Author: Matthew Smith gentoo org> AuthorDate: Sat Jul 9 10:16:20 2022 + Commit: Matthew Smith gentoo org> CommitDate: Sat Jul 9 10:16:41 2022 + 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 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.. --- 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 - #include - #include -+#include - #include - - #include 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.. --- 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 -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.. --- 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
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
commit: 71dd9cae20ac3342be0aed1831a80ea7858dc976 Author: Matt Smith offtopica uk> AuthorDate: Wed Jul 14 20:01:33 2021 + Commit: Sam James gentoo org> CommitDate: Fri Jul 16 01:33:23 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71dd9cae net-mail/mu: Guile 3 compat Closes: https://bugs.gentoo.org/755875 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Matt Smith offtopica.uk> Closes: https://github.com/gentoo/gentoo/pull/21643 Signed-off-by: Sam James gentoo.org> net-mail/mu/files/mu-1.4.15-guile3-1.patch | 141 + net-mail/mu/files/mu-1.4.15-guile3-2.patch | 17 net-mail/mu/mu-1.4.15-r2.ebuild| 72 +++ 3 files changed, 230 insertions(+) diff --git a/net-mail/mu/files/mu-1.4.15-guile3-1.patch b/net-mail/mu/files/mu-1.4.15-guile3-1.patch new file mode 100644 index 000..671a4685a27 --- /dev/null +++ b/net-mail/mu/files/mu-1.4.15-guile3-1.patch @@ -0,0 +1,141 @@ +From 623cf787ad009c42b2adf3767be5f01fec56ff5a Mon Sep 17 00:00:00 2001 +From: Danny O'Brien +Date: Mon, 7 Sep 2020 19:52:17 -0700 +Subject: [PATCH] guile: support version 3.0. + +Includes an update to the guile m4 package, and tweaks the build so that +both 2.2 and 3.0 should work fine. +--- + configure.ac | 14 +++--- + guile/Makefile.am | 2 +- + guile/mu/Makefile.am | 4 +--- + m4/Makefile.am| 2 +- + m4/{guile-2.2.m4 => guile.m4} | 15 +-- + 5 files changed, 19 insertions(+), 18 deletions(-) + rename m4/{guile-2.2.m4 => guile.m4} (97%) + +diff --git a/configure.ac b/configure.ac +index eb5629696..cc43f43db 100644 +--- a/configure.ac b/configure.ac +@@ -212,22 +212,22 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes" + ### + + ### +-# build with guile2.2 when available and not disabled. ++# build with guile 3.0/2.2 when available and not disabled. + AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile])) + AS_IF([test "x$enable_guile" != "xno"],[ +- PKG_CHECK_MODULES(GUILE22, guile-2.2, [have_guile22=yes],[have_guile22=no]) +- # this is a bit hacky; GUILE_PKG +- AS_IF([test "x$have_guile22" = "xyes"],[ +-GUILE_PKG([2.2]) ++ PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[ ++PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])]) ++ AS_IF([test "x$have_guile" = "xyes"],[ ++GUILE_PKG([3.0 2.2]) + GUILE_PROGS + GUILE_FLAGS + AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary]) + AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?]) + AC_SUBST(GUILE_SNARF, [guile-snarf]) +-guile_version=$($PKG_CONFIG guile-2.2 --modversion) ++guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion) + ]) + ]) +-AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile22" = "xyes"]) ++AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes"]) + ### + + ### +diff --git a/guile/Makefile.am b/guile/Makefile.am +index ed613068b..5c06ccc95 100644 +--- a/guile/Makefile.am b/guile/Makefile.am +@@ -69,7 +69,7 @@ SUFFIXES = .x .doc + + # FIXME: GUILE_SITEDIR would be better, but that + # breaks 'make distcheck' +-scmdir=${prefix}/share/guile/site/2.2/ ++scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION} + scm_DATA=mu.scm + + EXTRA_DIST=$(scm_DATA) +diff --git a/guile/mu/Makefile.am b/guile/mu/Makefile.am +index f531822cd..9339ad973 100644 +--- a/guile/mu/Makefile.am b/guile/mu/Makefile.am +@@ -16,9 +16,7 @@ + + include $(top_srcdir)/gtest.mk + +-# FIXME: GUILE_SITEDIR would be better, but that +-# breaks 'make distcheck' +-scmdir=${prefix}/share/guile/site/2.2/mu/ ++scmdir=${prefix}/share/guile/site/${GUILE_EFFECTIVE_VERSION}/mu/ + + scm_DATA= \ + stats.scm \ +diff --git a/m4/Makefile.am b/m4/Makefile.am +index eeb8a05a4..27a49eebe 100644 +--- a/m4/Makefile.am b/m4/Makefile.am +@@ -41,7 +41,7 @@ EXTRA_DIST= \ + ax_lib_readline.m4 \ + ax_require_defined.m4 \ + ax_valgrind_check.m4\ +- guile-2.2.m4\ ++ guile.m4\ + lib-ld.m4 \ + lib-link.m4 \ + lib-prefix.m4 +diff --git a/m4/guile-2.2.m4 b/m4/guile.m4 +similarity index 97% +rename from m4/guile-2.2.m4 +rename to m4/guile.m4 +index 89823e9c3..696897364 100644 +--- a/m4/guile-2.2.m4 b/m4/guile.m4 +@@ -47,8 +47,8 @@ + # for an available version of Guile. + # + # By default, this macro will search for the latest stable version of +-# Guile
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
commit: 8485a79ba9cd8be921c87cf58b3d4f0ae3ae0643 Author: Matt Smith offtopica uk> AuthorDate: Mon Jul 6 12:54:29 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Jul 7 06:55:18 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8485a79b net-mail/mu: Drop old Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Matt Smith offtopica.uk> Closes: https://github.com/gentoo/gentoo/pull/16609 Signed-off-by: Joonas Niilola gentoo.org> net-mail/mu/Manifest | 4 -- net-mail/mu/files/70mu-gentoo.el | 3 -- net-mail/mu/mu-0.9.18-r3.ebuild | 74 --- net-mail/mu/mu-1.0-r1.ebuild | 74 --- net-mail/mu/mu-1.3.5-r1.ebuild | 83 --- net-mail/mu/mu-1.3.6-r1.ebuild | 95 net-mail/mu/mu-1.3.6-r2.ebuild | 95 7 files changed, 428 deletions(-) diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 3a6e584920f..1519ed4faa5 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,7 +1,3 @@ -DIST mu-0.9.18.tar.gz 2250319 BLAKE2B 7eb83a797eccff706ac6b264a7d56feae80e40f370e190e0a94f2524dd73a8bfdb35599909f90d0a2b87fc513bbcf2b00fa307a3e4d0b6718ebdc7f7fcdc6df0 SHA512 47104d18547de0871782abc4e1c6dbf1f9b2489410e5716043861bf8d973d33d2138de7d7ac568b300ca86ae9f1a0fda0fa9555ad9a5938771336ef958183546 -DIST mu-1.0.tar.gz 2273670 BLAKE2B a771b00159142fa4a671d07cf9de6f0f941c432ddee31f19606c260ba3dfef857a36a333f5ede4ca30be88d7b7eae28e996e15a8deebd96971b341f0f72bfbbb SHA512 49b0b86f22e9a6ace1fc3fd6e7a8a523aa9edf092b953d59f59a1ef7311c8c546a261a1a186e3285cea788be20c816c70ac08d1514f700ff97258a2012ad394d -DIST mu-1.3.5.tar.gz 2305222 BLAKE2B ff6025cf053d7c2880855ec32953a2881ce8bc7d468082f13e45e7684dd41bd7906cbc9a619fd27bd4860bb953e4a547c3d22ea9a7fb4c645825c755ee33b5f9 SHA512 5d7eccec296affbe6e2e31d2204672f8ecac43f1a0c93673f983378fcf7ad8a050662097ec58603251eed31b499054d6c453a2a4e2c70dfdd896c430559b95c0 -DIST mu-1.3.6.tar.gz 2305653 BLAKE2B b9a556c1b374e0b72b6b0c40beba581dc3fe0e0a654a881db3a47582481ef00831e18bcd771e24b231ef843e97f14f7401ad8d041c077617b865f1fa971d1a0f SHA512 c889dc3fc1b7f1333f2adc3891f23ea8977c77ac6af532fec37c6570b4fbb2ce8dda0776568d61dedfa34f0519bb5bba89b90002503c3191a0d633ecfb9d5c87 DIST mu-1.4.1.tar.gz 2311134 BLAKE2B 4d44032874217167d46a68b1c837fb443dc860f1eb1f698c08d3731c131e196483028b0eee8bec13bbec71eeab6df1146013beb00b31824630154e14af914c09 SHA512 9a6d20a814f0cdf7c0a04e0e4a22210a12d539d9be713be8f689f2ed3ba39eaf9da7d1969a10f47af1a201cc23e91696e379cfcbd5d6586aea5e83997ba3e043 DIST mu-1.4.10.tar.gz 2309459 BLAKE2B 38aa09e1efd788f1ed0d490dfba04bf4f3fccf1eb40d22d2d205934ab6d71ec8739d1baa019ba4c9a0593a0d9487533a46048f71be042178bd33bde6130cbb80 SHA512 59c06e1a0bc893c7dcf5e758dad15be80667be8bb914e97f16158709ebfd50ca29b3a27934bc2df29cc378ce17a3778c5c44738703aa77f5bde21050abb6eb0c DIST mu-1.4.4.tar.gz 2311600 BLAKE2B 1953dc9e63fe013af2821a58fde0222d3d7b61266807bb95345aff7c6e3f988fa6589bcca79612bd64296f50e2b4feda62cc3f4aa4d731f3f4cebe4e3a21cceb SHA512 db317706956304df9e0c6d53ce9b2bf444f5fc66903deb8ac13c8d771ada016d009e3b10d8bf76cfeda1d712fa3e23bed70362334231cccfc072bc181c6660e5 diff --git a/net-mail/mu/files/70mu-gentoo.el b/net-mail/mu/files/70mu-gentoo.el deleted file mode 100644 index ce445f1c559..000 --- a/net-mail/mu/files/70mu-gentoo.el +++ /dev/null @@ -1,3 +0,0 @@ -(add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e") -(require 'mu4e) - diff --git a/net-mail/mu/mu-0.9.18-r3.ebuild b/net-mail/mu/mu-0.9.18-r3.ebuild deleted file mode 100644 index 17950a60e94..000 --- a/net-mail/mu/mu-0.9.18-r3.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 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="https://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" - -DEPEND=" - dev-libs/gmime:2.6 - dev-libs/xapian - dev-libs/glib:2 - emacs? ( >=app-editors/emacs-23.1:* )" -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 - 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
[gentoo-commits] repo/gentoo:master commit in: net-mail/mu/, net-mail/mu/files/
commit: 770e1fccb119fbce8ba6d16021a3598123f212ff Author: Matt Smith offtopica uk> AuthorDate: Wed Feb 12 14:13:32 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Thu Feb 20 13:22:28 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770e1fcc net-mail/mu: Use autoload instead of require Closes: https://bugs.gentoo.org/709344 Signed-off-by: Matt Smith offtopica.uk> Package-Manager: Portage-2.3.88, Repoman-2.3.20 Closes: https://github.com/gentoo/gentoo/pull/14639 Signed-off-by: Joonas Niilola gentoo.org> net-mail/mu/files/70mu-gentoo-autoload.el | 2 + net-mail/mu/mu-1.3.6-r1.ebuild| 99 +++ 2 files changed, 101 insertions(+) diff --git a/net-mail/mu/files/70mu-gentoo-autoload.el b/net-mail/mu/files/70mu-gentoo-autoload.el new file mode 100644 index 000..d868bf30334 --- /dev/null +++ b/net-mail/mu/files/70mu-gentoo-autoload.el @@ -0,0 +1,2 @@ +(add-to-list 'load-path "@SITELISP@") +(autoload 'mu4e "mu4e" nil t) diff --git a/net-mail/mu/mu-1.3.6-r1.ebuild b/net-mail/mu/mu-1.3.6-r1.ebuild new file mode 100644 index 000..44a758d9183 --- /dev/null +++ b/net-mail/mu/mu-1.3.6-r1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools elisp-common + +DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing" +HOMEPAGE="http://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/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 guile mug" + +DEPEND=" + dev-libs/glib:2 + dev-libs/gmime:3.0 + >=dev-libs/xapian-1.4 + emacs? ( >=app-editors/emacs-24.4:* ) + guile? ( >=dev-scheme/guile-2.0 ) + mug? ( + net-libs/webkit-gtk:4 + x11-libs/gtk+:3 + )" +# net-mail/mailutils also installes /usr/bin/mu. Block it until somebody +# really wants both installed at the same time. +RDEPEND=" + ${DEPEND} + !net-mail/mailutils" +BDEPEND="virtual/pkgconfig" + +SITEFILE="70mu-gentoo-autoload.el" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + local myeconfargs=( + $(use_enable emacs mu4e) + $(use_enable mug gtk) + $(use_enable mug webkit) + $(use_enable guile) + ) + + econf "${myeconfargs[@]}" +} + +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 + + 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-query.7 man/mu-remove.1 \ + man/mu-script.1 man/mu-server.1 man/mu-verify.1 \ + man/mu-view.1 man/mu.1 + + if use guile; then + doinfo guile/mu-guile.info + fi + + if use mug; then + dobin toys/mug/mug + fi +} + +src_test() { + emake check +} + +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 "http://www.djcbsoftware.nl/code/mu/mu4e/; + fi + + use emacs && elisp-site-regen +} + +pkg_postrm() { + use emacs && elisp-site-regen +}