gentoo resync : 16.09.2021

4 files changed, 2 insertions, 162 deletions

diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index bc88779941ee..c1095c804c8e 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,6 +1,4 @@
 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.6.1.tar.xz 866044 BLAKE2B ed6464e2ef63d37c42783235a0537cd20c7442333d4a6b59af0d257db8e3e6d85db7106ae2f89aa5f1536e50afadd40c89a8215a288080130d14e3ceb79b1638 SHA512 d894f302cabef86ff6b1d85eb945b2aca27729eaa6558598076c8f065d584592d5e601fe6a6045cea9b8a1466320c838f995ffdfd564447683538a5e48f8d7b0
 DIST mu-1.6.3.tar.xz 867224 BLAKE2B dffe67df4731028fa5e77d62d32fb787639b25d43a48aaac0c0e446c14cd3c5f79ad5559968446603782f1a7df9c129b2c3e1c3576e01d162a59693a2abd960e SHA512 73bfc85561cbc31d8c8ba6043ad79b7c17ac33edbbfcb3f09d460b291454c7696b282ee98c7738e05a9842963169c3f87eff56c3f6729cb22cdb6136ae8b95e3
 DIST mu-1.6.5.tar.xz 867240 BLAKE2B d3e8ad88b38f1329e4a5716f981c97e62c2042835e81910dab02b1219abfc670fe84a68f992fd08dce282a3288aaa91a465ce881f79e7ece917ba089c2ad0348 SHA512 b25203d281fa43b22abacb442caa56d797489d32bfc1dde874d23035510cbc8fb331b45574ea74d4a01e4af0a706c1a84656d8b8d6e60f518b2ea75fa27361ea
@@ -9,4 +7,4 @@ EBUILD mu-1.6.1.ebuild 1389 BLAKE2B ffaaa365678a15bb5c7bd38e1a0026175af64402ebdd
 EBUILD mu-1.6.3.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
 EBUILD mu-1.6.5.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
 EBUILD mu-1.6.6.ebuild 1366 BLAKE2B e88b818ba377df9a116abe8f8caea256ecb6036795e2a3212fd44bd645c88d5c85a90d205098e698beb224f48a7d48f4c66b59fd084015b078c2157897003ca6 SHA512 a76b9d3287e9b0a0d48716f978d3a8e79070a616143a5b82cb135b7005387dc0bf672e57d8b2a17fcb3838485260c85bc3973912533e939330410e69e7585cfe
-MISC metadata.xml 925 BLAKE2B e2267c540c5107d64c6fd7ab7c0e20476a473fe704facc4d692f7f90272ed05fdff5af673dcc492a134371ee81ad0c3794e7bd22e7cd10b4cc5e744fb26d25bf SHA512 e7f92466cfd6fb8bdc66c1262bc4b426f73f1cebea24fe4cd2f6a5f256df46ad7a9ad545faeb91bfeb2ea17fad848b2b7f7eeef576ef0e010b5a87d821a0c5e3
+MISC metadata.xml 926 BLAKE2B 14f872d6b63bbb9547b44759bca864546e040ebe1e4a9b8d3bc827e39251a1166cf893aa80926ff33949d9039f755cb9a68075ab1efbca820bbacce5972a8818 SHA512 bd0b0fe8182aefb2a8feb9dde074aa4d8b5a700914e318a9982cf696a72ff38e5ca8d9c8b600f31d3ff618fc5a87cd7a964d0dc55ef5d082bbee23040e69d0af
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
deleted file mode 100644
index 671a4685a275..000000000000
--- a/net-mail/mu/files/mu-1.4.15-guile3-1.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From 623cf787ad009c42b2adf3767be5f01fec56ff5a Mon Sep 17 00:00:00 2001
-From: Danny O'Brien <danny@codetherapy.space>
-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
deleted file mode 100644
index 6aa47d252306..000000000000
--- a/net-mail/mu/files/mu-1.4.15-guile3-2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- 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/metadata.xml b/net-mail/mu/metadata.xml
index dd851289df76..9bbd2af15171 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person" proxied="yes">
 		<email>matt@offtopica.uk</email>