gentoo resync : 28.04.2021

5 files changed, 72 insertions, 7 deletions

diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest
index e93ed95da3a9..1f5e847b4d80 100644
--- a/net-mail/notmuch/Manifest
+++ b/net-mail/notmuch/Manifest
@@ -1,5 +1,6 @@
 AUX 0.29.3-0001-Use-loopback-IP-address-rather-than-name.patch 2043 BLAKE2B 45adfbccfb394da03320971485a33480528a3904c7254742385799118e3812fc4f923253eaf94ae36eb0c73cd450d845f44ed817cd3ffa7cd5e6d42143b3e46f SHA512 6f9133a0b13d1383eaa7d31e1ea2bd0586294c8d815052d1027ae5c996734e5850840df3e6bf7b7e11d5c2de5ac7c4f017612dd3c12eae9178021b3a24572541
 AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e963a83649f6a67e5df6ae6105ae1ca83925a55e70e5b857c281b01312434a2ed95fb7dc50c3d6d9c7311 SHA512 80612ba5ae90f2fbb24b38bae99b660c5e3d58e7390a4bb3a0e5e9b49092e38f189347344286072617935abf7ea08b538f68e8227705ca0b2b44985c4c0d024b
+AUX notmuch-0.31.3-glib-2.68.patch 1807 BLAKE2B adca6eef581704ccf91bff0206de9bec8925ea26a837a95f57bf905b15c69cb54b06d1a9d775f55a1829291ae2f3bcde9b6f08e3c3e133824e95e490718b8231 SHA512 a48ae1494b5c7960979dd34d33b8b84f26b763f2a5a987b3964b3a5e256143296eb1d777bb500c65e6559e951075ee3a7e5eac2bca376a8527a9dc291437376f
 DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0
 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65
 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e
@@ -8,8 +9,8 @@ DIST notmuch-0.31.3.tar.xz 713900 BLAKE2B 64aa5c707a74544d31f1dce4e49f3e19cf8c73
 DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5
 EBUILD notmuch-0.29.3-r2.ebuild 5058 BLAKE2B 01e47dcc8cfee5bf33b921e396094f625049d13671fea805a0213de04596a9c1503724a131ea6c6f2604ab82cd8488765d8d9542333c6f54cd34ae40a066af89 SHA512 8c5ad62d0cc5ce62ad4c87f723014ac2b6037c8c947e34b9e554e17f69f449d15ed47711d5f69255f68c84be5be3f909e81c0be4dee09e3f483d4fc640a5d698
 EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B 7cab0a0c94d9d5743fe16086f2e2d52b6fda2387c4e795a30d08ec68e6cc6422c4126e5bc0191b77f8a8a023b3dbb12dbf62b60d52c8b342f1e5c13c742405ba SHA512 369c528d1daae29466504a67a238f58ac98b67dde87bf2a34d5710f65009fe87910aba401f26cbacde8f73becee714d4efb5123efce8edd5c1ef59df020d1f6b
-EBUILD notmuch-0.31-r2.ebuild 6373 BLAKE2B 16366fa91f7a3b3bc6b87c990fdf1a7be0daa8fc2fbabdb78d8db9594ce922dc11430722601397c9627dd88baa8fae7c5a9e4750d38ea5255c381c6d03bf1773 SHA512 f173ee893bca4a435ccc0f0ef6242b89d048915f6627a94cf7ee9f8bb96b1464ea04644dadd949acae7a1ca8454f235d6d54f422fdaa2a7d7c02c90c7132ab31
-EBUILD notmuch-0.31.2.ebuild 6347 BLAKE2B fc2af8aff2fa4e9a7cb624c031e86c3de253aea975f2daf7bd3b65f6cfe1c66048f8afa12dc0537544f0179ed88934e94362c915516bed8744581cbd7806a621 SHA512 87cc07eac3fcbea143e9fc6d519664d89b0f84ade32dfdf788f619de274a31b6b1f58a07d214f725812292c537ebfcbc2bcec73bc3b26e00e279fcc2917af6ac
-EBUILD notmuch-0.31.3.ebuild 6387 BLAKE2B 93f11704207ffb0f6f098dcfcb9b81f6b0eafc2e96859690585903b6de885bc3001cd3e648ceb247561f961be37d2b4e2305111894e4b3df31f8ffe8607677aa SHA512 2542aece62ff1d19b910fff45450e7bfa1584622ef277e60ccce79218700f6eeaa6e0a2f7200740f14bdfd7e1eed1e2211a9f51f108a0d35b73e264c9654cb40
+EBUILD notmuch-0.31-r2.ebuild 6366 BLAKE2B 3572aa085591ea7f47184fb8449897fa5a6c33e2bd5e1652282c63e09856c1289510958ff47176bbe4908b9f5c82b837f1eb2d86bc061e6b05d6342885a1a9ed SHA512 e4b69653b09c26a5ed8dbacb3b14b2773a4367e7bf4ed849a16e09a86dbfb71464ecbc7ef17c21b4b60031059b97a0861620569799b39f0beaa14fe0ff1a346f
+EBUILD notmuch-0.31.2.ebuild 6340 BLAKE2B 0b13fad7fe76e856d066ef460cb0247103c6f57c2fd1255640f259087beb8edf0b549f335ea4ddd1672dae21f7eef805fe02dcf789170ccb05cda3dc3769f6b0 SHA512 83d494d8a77e1b1543c51e77db21e65c2b291abae3b1ded89d205d52f3e1952008fb14181fc7bd6ea7667a683385b95b0be81500e031ec47117e9a984b178b8e
+EBUILD notmuch-0.31.3.ebuild 6429 BLAKE2B 4974a9db8a5fcfde4f5a357b299bb8bea1602eba958daa187954f01b75d4b26b90b5524dec78bd784329ce0e00a4cbe223007ed7c08bee941c8da15b39cf18c0 SHA512 5cd2a36e83ac60de80f8877014409e6e84b85fb0eb015a9c70c2053dd14cce2617142869b95cafbac05aefcdb990708f55fec3035b527c77fa96b4cb1ab333d7
 EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 4fcb5ea47f923a98238ef7216627196931f7b89c113f46478139b2cc80856c3800a245a2d25de0b27a4e1676bc106f5b0478fcd029e514abe21d359a64d5e5d8 SHA512 6018522ad82cba4b14cd6b0e407ae475b07ab67648829e29e01d17080cfd6faa87ecef27df458e2699ed5ea5d4e400b4491224bfe5eb7e9d5232d3433adda683
 MISC metadata.xml 1302 BLAKE2B a13d93a5a269026a9505186d6b3dbedab7f9fbd8de1d125dd60ae6e4e47cae7ac0c9da923901efeed8a3ec5fc62d0da40c80918024f7cc67bd10f6b2805c112d SHA512 f48a8eee902190414699a44bd64c5bc3c8ad3e9262fd05f4d88d928ef7c06248af54d5e8e4602d008913bffcc2c4d8b93a3443a8ac2520701324365cfa1dd4f1
diff --git a/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch
new file mode 100644
index 000000000000..19f00391093e
--- /dev/null
+++ b/net-mail/notmuch/files/notmuch-0.31.3-glib-2.68.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/777663
+
+From: David Bremner <david@tethera.net>
+Date: Mon, 15 Feb 2021 20:43:50 +0000 (-0400)
+Subject: fix build failure with glib 2.67
+X-Git-Tag: archive/debian/0.31.4-1~6
+X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=6db8b422d91a75b7c16f013f10f41d1109ce5866;hp=1692fe7aa8b137d02817bb11f248d204d6ab4048
+
+fix build failure with glib 2.67
+
+Based on a patch from Michael J Gruber [1].  As of glib 2.67 (more
+specifically [2]), including "gmime-extra.h" inside an extern "C"
+block causes build failures, because glib is using C++ features.
+
+Observing that "gmime-extra.h" is no longer needed in
+notmuch-private.h, which can simply delete that include, but
+we have to correspondingly move the includes which might include
+it (in particular crypto.h) out of the extern "C" block also.
+
+This seems less fragile than only moving gmime-extra, and relying on
+preprocessor sentinels to keep the deeper includes from happening.
+
+Move to the include to the outside of the extern block.
+
+[1]: id:aee618a3d41f7889a7449aa16893e992325a909a.1613055071.git.git@grubix.eu
+[2]: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1715
+---
+
+diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h
+index 57ec7f72..41aff342 100644
+--- a/lib/notmuch-private.h
++++ b/lib/notmuch-private.h
+@@ -31,6 +31,12 @@
+ 
+ #include "notmuch.h"
+ 
++#include "xutil.h"
++#include "error_util.h"
++#include "string-util.h"
++#include "crypto.h"
++#include "repair.h"
++
+ NOTMUCH_BEGIN_DECLS
+ 
+ #include <stdlib.h>
+@@ -47,14 +53,6 @@ NOTMUCH_BEGIN_DECLS
+ 
+ #include <talloc.h>
+ 
+-#include "gmime-extra.h"
+-
+-#include "xutil.h"
+-#include "error_util.h"
+-#include "string-util.h"
+-#include "crypto.h"
+-#include "repair.h"
+-
+ #ifdef DEBUG
+ # define DEBUG_DATABASE_SANITY 1
+ # define DEBUG_THREADING 1
diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild
index cc1c03f51dae..a9071674030d 100644
--- a/net-mail/notmuch/notmuch-0.31-r2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31-r2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
-inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild
index b100aef710ba..c95d95a83e49 100644
--- a/net-mail/notmuch/notmuch-0.31.2.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
-inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
diff --git a/net-mail/notmuch/notmuch-0.31.3.ebuild b/net-mail/notmuch/notmuch-0.31.3.ebuild
index d538001bf035..57d73612bb36 100644
--- a/net-mail/notmuch/notmuch-0.31.3.ebuild
+++ b/net-mail/notmuch/notmuch-0.31.3.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_OPTIONAL=1
 NEED_EMACS="24.1"
 PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
 
-inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils
+inherit bash-completion-r1 desktop distutils-r1 elisp-common flag-o-matic pax-utils toolchain-funcs xdg-utils
 
 DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging"
 HOMEPAGE="https://notmuchmail.org/"
@@ -85,6 +85,10 @@ RDEPEND="${COMMON_DEPEND}
 
 SITEFILE="50${PN}-gentoo.el"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glib-2.68.patch
+)
+
 pkg_setup() {
 	use emacs && elisp-check-emacs-version
 }