gentoo resync : 25.08.2020

3 files changed, 8 insertions, 38 deletions

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 574d07169a48..40d5363f9949 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,6 +1,5 @@
-AUX 3.32.2-libsecret-0.20-compat.patch 1333 BLAKE2B c1c80f28531726c60a709e136c1c156980d6eb5e32911ded5220382905180a542440e27ace8feab410f963a9920a5d2945085a45da1bd7aa3fbce83f8f776a08 SHA512 468f843cbbee56ae82ed3c36ea18e27e8e21611724631d12da9022bc24f8822c9d863c12b59d6f7110193f5a65cbfe41d3a7b61466d6ba2d2f4f994892d4a4c5
-DIST seahorse-3.32.2.tar.xz 1278668 BLAKE2B cd3fe6794ca02b1b0fd4b833a7128b8180137441a788f1f3ec5bb4186517ebb9e7422fabab2d19f60420b36e6b1ecab8b8326c99122aad185b8e45927232708f SHA512 e372f79907fbc5d60a41ea0db3a91575b0b304c1727c6091f94eec28445cd836faa32754582c59fd1eb8ce784986e63b4c8cabbd46d5e4cacec1150d9ca08481
 DIST seahorse-3.34.1.tar.xz 1271616 BLAKE2B 64956d0ee4f15bc048f42cefd827aad91927b34eecf4a2e53d988c379b3eae1ce0ae29ef469c2ff80ec9cceeaf77a271c57e28cb98dd24ae55c048faff487c1d SHA512 d2dff7d73a0968c1a5a8d39460f08b67f6794f22812200f564ef719354ab5cc2dac2213cba0d4bc10a455aecb9f55de8ff39943db4482beaac9cfdc2ca1012b8
-EBUILD seahorse-3.32.2.ebuild 1548 BLAKE2B c60b73c8b7e427f09b003ebc7d1028a82f236a9975dc41571bf05a16f443e11cd6566aafa502a74eabcb452b6b5b2e14b190c8aeb8b273045a4687eee21352ba SHA512 1aacea7daff0d72cd4b0826faf59430ba62b575dfafb968a950711a6fe68376b8a1afc3fef8176ea471def213ef08962c47d916f24bf7bbf2f64da0a11d7cf83
+DIST seahorse-3.36.2.tar.xz 1695824 BLAKE2B e4efb20f952e879b0ff17a9c8664ba61d10c69e377a2fdda52904a8bf5c026d147f9feb9b55c07982f256b366f756dd1567a522d89969c8c5c461f653a130676 SHA512 6a0cb7847fe9917d6d6da31f9b81a4737e425d451fc80604d8e3deb9fa57798f04aa577dae68bc156a15743975f74fbde5ff06a0b05b34228bdc9ef2539b6451
 EBUILD seahorse-3.34.1.ebuild 1556 BLAKE2B d74e2df94472048b48c8df990860d8848bae46774e26184528d5e04ee3de032262c943db32c55177c72d989c49c37ca129dbe93be29bc3cf24d609ef1b63f879 SHA512 9a4c566f6b3801ca42d0dcca75fbd6fdc3efb1a2bd712d5dc1b33d123fecf2b879b4906c127754a79554fcef8aff3c026b078e519648ee1ca03b43d763f5b4d2
+EBUILD seahorse-3.36.2.ebuild 1584 BLAKE2B 7c0b23297d3b47ea1dae7a7cc1cdab89a8d8e59e88ca0a1495382be6a6d01fa7919cd3f7b9ad19d8d8236930134001747ea1d12e49ebe0856fc3c3dae83c1ada SHA512 8406ca14aa60540f5c89f9a2ae898464b0c0b6af40401ce38cdef4c28ebf13eefd70f1558be15bba6137e864ca5c352fc1ac2a802896923bf4a16556aec783cd
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/files/3.32.2-libsecret-0.20-compat.patch b/app-crypt/seahorse/files/3.32.2-libsecret-0.20-compat.patch
deleted file mode 100644
index 38c7ca2c15f7..000000000000
--- a/app-crypt/seahorse/files/3.32.2-libsecret-0.20-compat.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d9db29db567012b7c72e85e1be1fbf55fcc9b667 Mon Sep 17 00:00:00 2001
-From: Niels De Graef <nielsdegraef@gmail.com>
-Date: Sat, 11 May 2019 09:02:34 +0200
-Subject: [PATCH] gkr: Use 0 on empty flags
-
-A Flags-type variable without any flag set can be replaced with 0, so
-this is a safe thing to do. It also prevents us from having to deal with
-the accidental API break in libsecret (see
-https://gitlab.gnome.org/GNOME/libsecret/merge_requests/19)
----
- gkr/gkr-keyring-add.vala | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gkr/gkr-keyring-add.vala b/gkr/gkr-keyring-add.vala
-index 4e92a520..f60c9a22 100644
---- a/gkr/gkr-keyring-add.vala
-+++ b/gkr/gkr-keyring-add.vala
-@@ -41,8 +41,7 @@ public class Seahorse.Gkr.KeyringAdd : Gtk.Dialog {
- 
-         var cancellable = Dialog.begin_request(this);
-         var service = Backend.instance().service;
--        Secret.Collection.create.begin(service, this.name_entry.text, null,
--                                       Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE,
-+        Secret.Collection.create.begin(service, this.name_entry.text, null, 0,
-                                        cancellable, (obj, res) => {
-             /* Clear the operation without cancelling it since it is complete */
-             Dialog.complete_request(this, false);
--- 
-2.20.1
-
diff --git a/app-crypt/seahorse/seahorse-3.32.2.ebuild b/app-crypt/seahorse/seahorse-3.36.2.ebuild
index 3d701d04f420..e76835d6eeea 100644
--- a/app-crypt/seahorse/seahorse-3.32.2.ebuild
+++ b/app-crypt/seahorse/seahorse-3.36.2.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="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
@@ -18,6 +18,7 @@ RDEPEND="
 	>=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=
 	>=app-crypt/libsecret-0.16
 	dev-libs/libpwquality
 	net-misc/openssh
@@ -29,6 +30,9 @@ DEPEND="${RDEPEND}
 	$(vala_depend)
 	dev-libs/appstream-glib
 	dev-libs/libxml2:2
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xsl-stylesheets
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	dev-util/itstool
@@ -38,10 +42,6 @@ DEPEND="${RDEPEND}
 	app-crypt/libsecret[vala]
 "
 
-PATCHES=(
-	"${FILESDIR}"/${PV}-libsecret-0.20-compat.patch # included upstream for 3.34
-)
-
 src_prepare() {
 	xdg_src_prepare
 	vala_src_prepare
@@ -57,6 +57,7 @@ src_configure() {
 		-Dhkp-support=true
 		$(meson_use ldap ldap-support)
 		$(meson_use zeroconf key-sharing)
+		-Dmanpage=true
 	)
 	meson_src_configure
 }