gentoo resync : 15.01.2020

3 files changed, 39 insertions, 3 deletions

diff --git a/gnome-extra/seahorse-nautilus/Manifest b/gnome-extra/seahorse-nautilus/Manifest
index c37c68c7d9d4..d50b0f48e13b 100644
--- a/gnome-extra/seahorse-nautilus/Manifest
+++ b/gnome-extra/seahorse-nautilus/Manifest
@@ -1,3 +1,4 @@
+AUX seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch 837 BLAKE2B fa8d92171af088031804beab1356d4e43249da21d977fd33a524150cce8d3d0fd9180e9d8bcd5d96954b5821e40bc211a53d1be690836018a850ebcdda4e52ad SHA512 eabcde1d066c3e3d1ce95a437043b84ce387e2f81eb1137c6b6e4db96b89e7a30c61e792b0221625277106f8d5f1d19f22527c61a70026d3230f11aebda29eb8
 DIST seahorse-nautilus-3.11.92.tar.xz 395304 BLAKE2B f7c741a2d0ae06636ed380c3b8f0006e183bd2eacae87f0c1bfa0d4f1fa0834401a86b7a2b2b21df268ec18b57fbeb6805f30dc20ae43e5456eb05635fda150b SHA512 d3815bfaaf2a5e96beb94abe01fb3f7733e867a04681d4bed540fce58f6556c62534d3217ec0bf1452e848551a42ec703ec241029486d3dcd966c16ff27b87f2
-EBUILD seahorse-nautilus-3.11.92.ebuild 1237 BLAKE2B a5f2583478772c57fd3d87a8c4b6702f96da40db1b02b45f9ed32ce7e06c228314bc47c4150eb2ab5698b1860460d093cb0f150e94c1de9a991830c50267ba21 SHA512 5dcfa5af58c3de8164df46705c17bfbd3a3a42a47256a522e8846086c544efecc761040f11dc392dd6114c51c6dafe024550b056f3c331b038bc2c77f11feedf
+EBUILD seahorse-nautilus-3.11.92.ebuild 1399 BLAKE2B 3f7397c8bba76d955f9910b0e0150b5a98dc71115d4c63864525ef8f8a721bfdf1bc1240ec1795484894c715ced8762f4dd4db9b98d04821f9841e3677bd5d4b SHA512 bde90ab73427ad5429ee32169912cfb589bd82e77fd9df866fdbf386fcaaf1646a925d9fef7c4b67f818df407f20f836db0998f2c6407ea5fe14b4864b8b7716
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch b/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
new file mode 100644
index 000000000000..5044cd7f26b2
--- /dev/null
+++ b/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
@@ -0,0 +1,31 @@
+From 8193f85dc3caeae23e5931c10f52ac9c5324d9d9 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw@redhat.com>
+Date: Fri, 8 Jun 2018 12:40:09 +0200
+Subject: [PATCH] Remove libgnome-keyring dependency
+
+It's not needed by seahorse-nautilus
+---
+ configure.ac | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 471b34d..8d1f39f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,13 +146,6 @@ else
+ fi
+ AC_SUBST(NAUTILUS_EXTENSION_DIR)
+ 
+-# -----------------------------------------------------------------------------
+-# Keyring
+-
+-PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
+-SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
+-SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
+-
+ # -----------------------------------------------------------------------------
+ # DBus
+ 
+-- 
+2.14.4
+
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
index 0dc09ebdd133..446b85c14372 100644
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
+++ b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI="6"
 GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
 
 inherit gnome2
 
@@ -45,6 +45,10 @@ src_prepare() {
 	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
 		tool/seahorse-notification.c || die
 
+	# Doesn't really need libgnome-keyring (from Fedora, fixed in
+	# 'master')
+	eapply "${FILESDIR}"/${P}-remove-libgnome-keyring.patch # needs eautoreconf
+
 	gnome2_src_prepare
 }