gentoo resync : 28.04.2021

4 files changed, 53 insertions, 17 deletions

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 3894614a970b..c69210cfacd9 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,5 +1,6 @@
-DIST seahorse-3.36.2.tar.xz 1695824 BLAKE2B e4efb20f952e879b0ff17a9c8664ba61d10c69e377a2fdda52904a8bf5c026d147f9feb9b55c07982f256b366f756dd1567a522d89969c8c5c461f653a130676 SHA512 6a0cb7847fe9917d6d6da31f9b81a4737e425d451fc80604d8e3deb9fa57798f04aa577dae68bc156a15743975f74fbde5ff06a0b05b34228bdc9ef2539b6451
+AUX seahorse-40.0-fix-segfault-with-ldap-disabled.patch 1056 BLAKE2B bde592e3c78f28503d0e113da676639c76d9ab8c17226bd94e82b2e3cd1612088147b62d064cc0d7268d8cd75912c8239e52ec7c7c96f4f8aeff5120a955b367 SHA512 9c69c11540ea9dab84bafac8ee12302eea47e67276a6023a91768a612d42325a9496ec7472ba988dab7ad79cc7b6f5c012e5c0cb94b90f9509f0c71e72cc3c97
 DIST seahorse-3.38.1.tar.xz 1725480 BLAKE2B 348d9fe1208a9205c58c5655ce97b79c279e2e3506f041a1ebac1f7c83666186ec792bafe7f23b470dd1202a12bc974376b8c369888c6fa194739e7a15973d63 SHA512 1a064ecaf1a25aa84010f914043c3776eba464844598b15e0822217ad330396516df64afed1aeffb3c7b6102d1477c280ec8ec32101cf9f5120c433431b9df32
-EBUILD seahorse-3.36.2.ebuild 1617 BLAKE2B 74ce0bde4fcf4c6e4206075d5e16db5365ee57f90f32d86e07be2d881e8e4f4fb4cea3f77137450c03504cb63ae6243f4e5840c14756a2cca0d5ad9b478fa9bc SHA512 4c7e8563f478ae8852a1c9dca359fb4e0a731e1f6a5e508d40a3487f9b92ac38894bcf52db84e1dfe35239b9de8659957e6e303ebe05dc058ef744cd016cc91c
-EBUILD seahorse-3.38.1.ebuild 1619 BLAKE2B e619cfac7a6e96f1b0f66fdd9bc7368bd6ed9c59d7a2aa8ddc981bf33ac8050218c7162930bb95579e385231abe52e6979a78650910b3277da898ee74f6d3109 SHA512 16cd3b53b6d6410c04a97c23a868d27e8bce6c6c7082bcc6e1aa0efdfd0e2b21c361af8040f68f93d616f9b6fbf8a0cb2b1ba78f3305690368d6377310b23da6
+DIST seahorse-40.0.tar.xz 1309064 BLAKE2B dd179ef13c79454b30571959b33c02a523591fa9d59957e0c30ec5d75a52bd8e9a5b420214f85d5feac0849d69a51ddcee808ab47e4bf97d7ac99094f853bc9a SHA512 c389420fb1b3d54c1b9a1004f2c8b9e50118a1ffcba02aa8cfdd2223d1bc117368c9a1ad875c59abd319d95eb93ec3de2e9cedadbfc1d6a0997d613c8256c60b
+EBUILD seahorse-3.38.1.ebuild 1616 BLAKE2B af4870e0d0ef260b59302ebb21c93bd3f544ac4a64936635d0a0aebef03374209a6729b4b5cba75c768df5db8bf736abe69ae4c42e7e72d99fa1951b69cad726 SHA512 323b55432d52530effd6214110000d2dbb01d029605b4846a0fb9a6a3b2e854c38701c73ff7caebcbd8b6cadefaf44df956d93e7f5a0fb6ebcdfbe02829c73ff
+EBUILD seahorse-40.0-r1.ebuild 1691 BLAKE2B c53290893f1c56f26163cb429ecef91f60ef220cab239868271505b604a79856f0002675443c3256d51d11e367cc6b05b2bc44071d81de8941d1372156b70ea4 SHA512 e042c561e359fcaaa4d067b6f19327911517ec914dba3497ba8c9d619a2953fedaf39f84785bfcf89a9c69c3b8b47272905cfa4fa286aaff62cbe91e62c8cbdf
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch b/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch
new file mode 100644
index 000000000000..8454a0388ea0
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-40.0-fix-segfault-with-ldap-disabled.patch
@@ -0,0 +1,29 @@
+From 6fc0e3e321cdf0bf7e047234561fe8a8084a93f9 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@mengyan1223.wang>
+Date: Wed, 14 Apr 2021 23:18:06 +0800
+Subject: [PATCH] Fix segfault when built with ldap disabled
+
+Fixes #321.
+---
+ pgp/seahorse-pgp-backend.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/pgp/seahorse-pgp-backend.c b/pgp/seahorse-pgp-backend.c
+index 25febf31..8c10e7e3 100644
+--- a/pgp/seahorse-pgp-backend.c
++++ b/pgp/seahorse-pgp-backend.c
+@@ -445,7 +445,10 @@ seahorse_pgp_backend_add_remote (SeahorsePgpBackend   *self,
+         /* Don't persist, so just immediately create a ServerSource */
+         g_autoptr(SeahorseServerSource) ssrc = NULL;
+         ssrc = seahorse_server_category_create_server (uri);
+-        g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
++        /* If the scheme of the uri is ldap, but ldap support is disabled
++         * in the build, ssrc will be NULL. */
++        if (ssrc)
++            g_list_store_append (G_LIST_STORE (self->remotes), ssrc);
+     }
+ }
+ 
+-- 
+GitLab
+
diff --git a/app-crypt/seahorse/seahorse-3.38.1.ebuild b/app-crypt/seahorse/seahorse-3.38.1.ebuild
index 031375c4f5c1..c3761406ca46 100644
--- a/app-crypt/seahorse/seahorse-3.38.1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.38.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.58:2
diff --git a/app-crypt/seahorse/seahorse-3.36.2.ebuild b/app-crypt/seahorse/seahorse-40.0-r1.ebuild
index 857a62597523..cb214296bdda 100644
--- a/app-crypt/seahorse/seahorse-3.36.2.ebuild
+++ b/app-crypt/seahorse/seahorse-40.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit gnome.org gnome2-utils meson xdg vala
 
 DESCRIPTION="Manage your passwords and encryption keys"
@@ -10,15 +10,15 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
-	>=dev-libs/glib-2.44:2
-	>=app-crypt/gcr-3.11.91:=
-	>=app-crypt/gpgme-1.7.0
-	>=x11-libs/gtk+-3.22.0:3
-	>=app-crypt/gnupg-2.0.12
-	>=gui-libs/libhandy-0.0.12:0.0=
+	>=dev-libs/glib-2.58:2
+	>=app-crypt/gcr-3.38:=
+	>=app-crypt/gpgme-1.14.0
+	>=x11-libs/gtk+-3.24.0:3
+	>=app-crypt/gnupg-2.2
+	>=gui-libs/libhandy-1.1:1=
 	>=app-crypt/libsecret-0.16
 	dev-libs/libpwquality
 	net-misc/openssh
@@ -28,21 +28,27 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	$(vala_depend)
-	dev-libs/appstream-glib
 	dev-libs/libxml2:2
-	dev-libs/libxslt
+	app-crypt/gcr[vala]
+	app-crypt/libsecret[vala]
+	gui-libs/libhandy:1[vala]
+"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xsl-stylesheets
+	dev-libs/appstream-glib
+	dev-libs/libxslt
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
-	app-crypt/gcr[vala]
-	app-crypt/libsecret[vala]
-	gui-libs/libhandy:0.0[vala]
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-segfault-with-ldap-disabled.patch
+)
+
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare