gentoo resync : 31.05.2021

3 files changed, 2 insertions, 80 deletions

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index c69210cfacd9..2a951cb3c650 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,6 +1,4 @@
 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
 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
+EBUILD seahorse-40.0-r1.ebuild 1688 BLAKE2B 1467777527251f2dfb6501ec2ea5054428cdbc52d0cbd08bb9f4cda244de7bee02a64c666274e724e07d8a8a1750c47cbed1886a3741c7201743d5a2d458ccb3 SHA512 a23db51158cd52eeb5db93b1479f726be7d00a4f69766fcd8d48a0304b1420420a5b3f635c44f4a9b0f7c1bc4848edf79e7db23e1d7ed8aeab01fcd994ac8ac5
 MISC metadata.xml 742 BLAKE2B 11cc6cebe3f395ccd9f2570a419e812951287d7a9af2bd88720a66c7349305c108c451b67a33f9a6da0c82d7b0731ca74980dd7515db3d167993008633973a6f SHA512 cf7cceeaedb1fdb503def974d945a7a5d38a95105dda77f7e917abcec8ce823b461bf3cd1ab5f1a458de859e48a4d58abde71a5a4599685772936eb3525ae3af
diff --git a/app-crypt/seahorse/seahorse-3.38.1.ebuild b/app-crypt/seahorse/seahorse-3.38.1.ebuild
deleted file mode 100644
index c3761406ca46..000000000000
--- a/app-crypt/seahorse/seahorse-3.38.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="Manage your passwords and encryption keys"
-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"
-
-RDEPEND="
-	>=dev-libs/glib-2.58: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:1=
-	>=app-crypt/libsecret-0.16
-	dev-libs/libpwquality
-	net-misc/openssh
-	ldap? ( net-nds/openldap:= )
-	>=net-libs/libsoup-2.33.92:2.4
-	zeroconf? ( >=net-dns/avahi-0.6:=[dbus] )
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-libs/libxml2:2
-	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
-"
-
-src_prepare() {
-	xdg_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dhelp=true
-		-Dpgp-support=true
-		-Dcheck-compatible-gpg=false # keep lowest version listed as compatible as min dep for gnupg RDEPEND
-		-Dpkcs11-support=true
-		-Dkeyservers-support=true
-		-Dhkp-support=true
-		$(meson_use ldap ldap-support)
-		$(meson_use zeroconf key-sharing)
-		-Dmanpage=true
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-crypt/seahorse/seahorse-40.0-r1.ebuild b/app-crypt/seahorse/seahorse-40.0-r1.ebuild
index cb214296bdda..935f5b5b2e62 100644
--- a/app-crypt/seahorse/seahorse-40.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-40.0-r1.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