From 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 17 Jul 2021 19:04:28 +0100 Subject: gentoo resync : 17.07.2021 --- net-mail/mu/Manifest | 3 + 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 +++++++++++++++ 4 files changed, 233 insertions(+) create mode 100644 net-mail/mu/files/mu-1.4.15-guile3-1.patch create mode 100644 net-mail/mu/files/mu-1.4.15-guile3-2.patch create mode 100644 net-mail/mu/mu-1.4.15-r2.ebuild (limited to 'net-mail/mu') diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 535870f2ced7..d37350d6ce93 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -1,6 +1,9 @@ AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea +AUX mu-1.4.15-guile3-1.patch 5237 BLAKE2B 49fb8d7c75d0dc758b7a0cc4d69fca9a1d776c522037271e985b8667c82e04b5487a9a3f4a0537a1aaf81950f95e06e258abc79a1b9d572f8a9cce4144d883b1 SHA512 ca2a06e604ea86b24f5f11d1901ab27dfd54346c4cc9417ae95ac9d0472e4f0e1bf3aad638cc06d8b354339defbbd5972096b563d362c0d23265ae60e1e0790c +AUX mu-1.4.15-guile3-2.patch 506 BLAKE2B ff01cdf9d9da6d4a2f2517c9a6df56e13929e4e9795f951c8f0cd3778c6a4f82cec305e2d24e05040b2395796690b9205e22699ce102745e9367e926ef6eaccd SHA512 c1da640ac0d900653b21d64b3078b8c3a02bc38a2745adb76a2c3c27f8829d0678daa18bb58e238d07a2d01d716a4291746840ad5438caa9637454f17ac8ddb4 DIST mu-1.4.15.tar.gz 2309695 BLAKE2B 9808e59b758525937ec97e0ca6515108c1fb4287f3134d0c6038a74ef57b4992fede6b8957ba4e7e1681d8d307aec32fa6b2931e588004849e6c1dfb7da2f7f5 SHA512 dd0426c1fb7fe2430b47fc1232e067d1c017b3c428bbd8012c542f6e1ffa7741bb145c6851f40cbc945403534dabb4aa99faf369166167d187f083dde1d30546 DIST mu-1.4.15.tar.xz 846052 BLAKE2B 933d04696c4ac145f20ca6c84f6fbe62f70fa3e45e50dfdf2e48a7007acecc56d8650f965dc6810fc7f8bbdae6595b7b7349f2675b08cd9fb619ee9eb24eb251 SHA512 e7741b77bce5c7c1c818549e803fb386f0b8727b995a7ac9b961b74e89cc7dbeed52b45d70895995a1640cfd36a49b052eeeed9be6c48999f2182a68bf5c205e EBUILD mu-1.4.15-r1.ebuild 1374 BLAKE2B 6b14c1413eff8c536636d0a4e4a9ddc7db6a725f30ea34e48fe74154a5ba233aad28d268202adf1859cf7955dc78d083a72f97133951afc6c1d4ceea4fbdfdf9 SHA512 ad2787b57a340441aa760c7ff19dd906cfe7abf796136d5d72c6e2dade58dcd61f4204e192beff1d5f1f14636ecf6e451903073fea6f80dc0e8c676282bb7618 +EBUILD mu-1.4.15-r2.ebuild 1535 BLAKE2B 78399a21ac72dd380d097c76b15e7146e5e1d470fc16ec5c548ab18a56b4e0419751b68f3515bedebd591ad44bd68cbf7d451821a5b3c2cb1eec43a208516046 SHA512 18d3d5d1f811925cd2cb01c0c4302b76a841d0cd46e6fbc9cf52ffec716fd2f34775d06df10a1c51e6553e763d6be9675fe1ce0612781c2b2abab1c0e9d79fd6 EBUILD mu-1.4.15.ebuild 1772 BLAKE2B 8b31278a7ee402b88f93ddea57340c8067be56a7b9377d20d705bffb56c2baac4e0c9c1bde2ce0b1b432e68b7bf40229e4ac775fa66a43df126f7cf22aa504ab SHA512 a611058c25591343bf57a5a820481516b71005e811e60a26b47d25f04f7ec8c5ca9b9936d5259f8fbd9f17c296a01246a48b451ef21a52268991b19dd6960441 MISC metadata.xml 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3 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 000000000000..671a4685a275 --- /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 (e.g. 2.2), falling back to the previous stable version +-# (e.g. 2.0) if it is available. If no guile-@var{VERSION}.pc file is ++# Guile (e.g. 3.0), falling back to the previous stable version ++# (e.g. 2.2) if it is available. If no guile-@var{VERSION}.pc file is + # found, an error is signalled. The found version is stored in + # @var{GUILE_EFFECTIVE_VERSION}. + # +@@ -60,8 +60,11 @@ + # @code{AC_SUBST}. + # + AC_DEFUN([GUILE_PKG], +- [PKG_PROG_PKG_CONFIG +- _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])" ++ [AC_REQUIRE([PKG_PROG_PKG_CONFIG]) ++ if test "x$PKG_CONFIG" = x; then ++ AC_MSG_ERROR([pkg-config is missing, please install it]) ++ fi ++ _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0])" + if test -n "$GUILE_EFFECTIVE_VERSION"; then + _guile_tmp="" + for v in $_guile_versions_to_search; do +@@ -221,7 +224,7 @@ AC_DEFUN([GUILE_SITE_DIR], + # as well. + # + # By default, this macro will search for the latest stable version of +-# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older ++# Guile (e.g. 3.0). x.y or x.y.z versions can be specified. If an older + # version is found, the macro will signal an error. + # + # The effective version of the found @code{guile} is set to +@@ -237,7 +240,7 @@ AC_DEFUN([GUILE_SITE_DIR], + AC_DEFUN([GUILE_PROGS], + [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])" + if test -z "$_guile_required_version"; then +- _guile_required_version=2.2 ++ _guile_required_version=3.0 + fi + + _guile_candidates=guile diff --git a/net-mail/mu/files/mu-1.4.15-guile3-2.patch b/net-mail/mu/files/mu-1.4.15-guile3-2.patch new file mode 100644 index 000000000000..6aa47d252306 --- /dev/null +++ b/net-mail/mu/files/mu-1.4.15-guile3-2.patch @@ -0,0 +1,17 @@ +--- + lib/mu-script.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/mu-script.c b/lib/mu-script.c +index 1175a60e3..92a63992e 100644 +--- a/lib/mu-script.c ++++ b/lib/mu-script.c +@@ -318,7 +318,7 @@ mu_script_guile_run (MuScriptInfo *msi, const char *muhome, + g_return_val_if_fail (muhome, FALSE); + + argv = g_new0 (char*, 6); +- argv[0] = g_strdup("guile2.2"); ++ argv[0] = g_strdup(GUILE_BINARY); + argv[1] = g_strdup("-l"); + + if (access (mu_script_info_path (msi), R_OK) != 0) { diff --git a/net-mail/mu/mu-1.4.15-r2.ebuild b/net-mail/mu/mu-1.4.15-r2.ebuild new file mode 100644 index 000000000000..fa8dc2e30146 --- /dev/null +++ b/net-mail/mu/mu-1.4.15-r2.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools 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/archives/refs/tags/${PV}.tar.gz -> mu-${PV}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos" +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.2:* ) + mug? ( + net-libs/webkit-gtk:4= + x11-libs/gtk+:3= + )" +RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.4.15-guile3-1.patch + "${FILESDIR}"/${PN}-1.4.15-guile3-2.patch +) + +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[@]}" +} + +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 +} -- cgit v1.2.3