gentoo resync : 31.05.2021

27 files changed, 80 insertions, 243 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9a4eccd2af20..6497261dae67 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/age/Manifest b/app-crypt/age/Manifest
index 4ecbad8f4603..e1b9eb49ff2b 100644
--- a/app-crypt/age/Manifest
+++ b/app-crypt/age/Manifest
@@ -1,7 +1,10 @@
 DIST age-1.0.0_beta_p7.tar.gz 42209 BLAKE2B 14122a698c725d2a3174296864e16a7f629f733094274b7d1ae8f050a6f3014d55f6c0277a916dc0c2178362e0433e103eff331e48133d25f785ee5c85ce8c48 SHA512 62033d8694de1a490a09518282df414a37123e65d48af0e1eb986058d41f4d8e07a0fbabd9473b37e00e68de25a199a5d2d4bd08ae8fe285f6eb30d0ba2de5cf
 DIST age-1.0.0_rc1.tar.gz 46998 BLAKE2B 0a17e8cd69bb41195170fa9085becf98a6e1da81ba459612b863faf1a16f2030f97bfb32570627e56c7c32720f45f4c60e1177e97a4a708a257c6a8d5251c3a4 SHA512 7efcd2f84fba3d6da8cda0b8229fedab692db8731de94d0b4c60bfaee68f91bb9bed3c78d894916dafceb414a90773d9258457b39ec4d373a80b6e08e06fc87f
+DIST age-1.0.0_rc2.tar.gz 56579 BLAKE2B a92b08261a299da76cb1df133d4a4406bebfbaed08c07746af25b1f7126a244287ca1305acdd7757892a3a0f2c2f0294471bd1af9f7c5fd8ad77f798f40795e9 SHA512 488255ccf268a45f304d3fdcacbf32e214835516900b61e0554fe586bf61161e3bba2b1ee88e732490cdf82118a922c372133c888753d51f4d7afcb80421c088
 DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-alpha.2.mod 40 BLAKE2B bd9471e49922bbabdc776224c508b0b6abe1a140718f37bf99c62c5ec0fe77d94ce3c5d03dcfd673e1df0250779929535cc11f7a44d1e8957627ea6dd99a4702 SHA512 8cbfb9981941ccdb0f1c0848e267a7c4e9b14fbe6d0507e2f4faf3cb1b494657f33eb70bdf07602ed90f39c1d9b3713b7be95cd761f0d7a8f04fa99ece99386e
 DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-alpha.2.zip 81479 BLAKE2B eccd14f704086ae3e4b9011f668b40d23e05b84bb01eaf0dbaa651979451c159b09482ab15ca85d5132071410d3592ce919f5367c1a42278f84d6820d063e20a SHA512 94c2e0c342b764b99f3f8f314c6882fc55f3efd029f11db0f19f5072dd83e2db5726b91cd819dde9642af84af945c67cb250d571a3dbf34651fce1f604978968
+DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.mod 40 BLAKE2B bd9471e49922bbabdc776224c508b0b6abe1a140718f37bf99c62c5ec0fe77d94ce3c5d03dcfd673e1df0250779929535cc11f7a44d1e8957627ea6dd99a4702 SHA512 8cbfb9981941ccdb0f1c0848e267a7c4e9b14fbe6d0507e2f4faf3cb1b494657f33eb70bdf07602ed90f39c1d9b3713b7be95cd761f0d7a8f04fa99ece99386e
+DIST filippo.io%2Fedwards25519%2F@v%2Fv1.0.0-beta.3.zip 84404 BLAKE2B 8e04457aa65ff295afde6913b152a5294f5e8b2d8c081e4ca89f78cddd9f5013c8528d417877a8eba11ce0ceac885ff968a96777499abfaa3110f0405c27f3ed SHA512 7fb52e1050f25d41d32022a8ab6a7f6bbbcedd47e4fc435311b3c498ea575831a754b9a3ded66dfd8d8d22f768877039285d7093f9e08328574182f3fd07b7fd
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
 DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
@@ -39,4 +42,5 @@ DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod 95 BLAKE2B adb3684980f1d8e6c23444e9102
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.zip 80160 BLAKE2B 7c19bcfee1136e9afaa54bb36a296e48c276e21517eead613313409f3ff85f4a961c1dca7926d3c4fd51feb0f537a85de905294d2a310276bb8177f27f3776c3 SHA512 a8fa21d2f84f8c6f28250e9ec7d678ae160963eaa0a373f345fe67804925b2647239a6117ad6f253f458f34ec9f62bc21e8f2071fc9dfe76dbd2a7ded1e1a0e0
 EBUILD age-1.0.0_beta_p7.ebuild 2146 BLAKE2B f7e496b5bbcf68344c2cad3139727ad240062960dfa060d3b9e973463bb2593aef62597280ccfcb6b2acb2e0014e7a902e8f6d0672be134e9e7edbb6e74fc61d SHA512 4aecaf1fea7a30e7f87f6ef21f6f41774ad65fe2e092787bff261d5ce16976c633035f568aedbf7da99d9526c37e73503cca125ce29f59e96a38bb11e56dfd93
 EBUILD age-1.0.0_rc1.ebuild 1334 BLAKE2B d217923a1291767db76abfb875e591042490b29ac8638e519149e8423ae4ebbd0a322708187a894d7e7fe8decba9b9590c57774cb147e9b74aa1124697f21137 SHA512 e8ac4c898888e03787bf6a90449ccb9e198f5e5b859637ad27cb9b4e1e8e27fea8b62f061f384157cb79cbdf4c28ee7ed468caebb993e24dd4d7a28a2a6962b1
+EBUILD age-1.0.0_rc2.ebuild 1455 BLAKE2B b5be3bb0fd9b17ef3591e76c1e481762e3fd8c595c553345cdb1acde7b72f574475afa97d7d5f2ade40c8c931385e301d7f17dc574672146ac2964121d6ebc6f SHA512 d5eab40ccc7b4af09764280f8327c863b2e718df06ea6b2a2db2ba8d2a12cdb6d696f605ecb93571f26f707358d3c995c85545e05b3a763ded7bff283daa6916
 MISC metadata.xml 494 BLAKE2B 5a89615ab0c16c16af34374e9ee3ff09d3cafe877e341767c2ee59196c802b3a79419d776e7f6374d8da9868617297082a6b11cbe9e8161ed617bb5e24b8250b SHA512 009d6eb02b95214760941b612df2c5de4b17ec1515b5ac0bba08a5670aff1a42a77e5a9c77ae1775056157ae004ca037d5a3ab58daa24c7334755eab34ef7add
diff --git a/app-crypt/age/age-1.0.0_rc2.ebuild b/app-crypt/age/age-1.0.0_rc2.ebuild
new file mode 100644
index 000000000000..43d7ce74976a
--- /dev/null
+++ b/app-crypt/age/age-1.0.0_rc2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="A simple, modern and secure encryption tool (and Go library)"
+HOMEPAGE="https://github.com/FiloSottile/age"
+
+MY_PV=$(ver_cut 1-3)-rc.$(ver_cut 5)
+
+EGO_SUM=(
+"filippo.io/edwards25519 v1.0.0-beta.3"
+"filippo.io/edwards25519 v1.0.0-beta.3/go.mod"
+"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
+"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
+"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
+"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
+"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
+"golang.org/x/text v0.3.0/go.mod"
+)
+go-module_set_globals
+SRC_URI="https://github.com/FiloSottile/age/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+S="${WORKDIR}/age-${MY_PV}"
+
+LICENSE="BSD"
+#RESTRICT+=" test"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-go/gox"
+
+src_compile() {
+	go build -ldflags "-X main.Version=${MY_PV}" -o . filippo.io/age/cmd/... || die
+}
+
+src_test() {
+	go test -race filippo.io/age/cmd/... || die
+}
+
+src_install() {
+	dobin age age-keygen
+	doman doc/age.1 doc/age-keygen.1
+	dodoc README.md
+}
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 214591951964..5736913f39d7 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -1,7 +1,4 @@
-AUX 3.38.0-avoid-gnupg-circular-dep.patch 1994 BLAKE2B bcb5be508a5d0ef580197aa2405e18cb90f28b4c3edac7b80eea2fcff3585ee9d8373e2b8c19e4c6a845dc578ca591131aeec698e19d27cef1716e4cb350eb15 SHA512 5407ee82605a66d6f59b81c5ec17e8293f5d93d405fe474fecf0cb2645aecda2f06d61baea5ab9f477135651584552be613b0944d290e771fecf7e49f55025b5
 AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af101dac4e2e9759f354a59a7243c45eae4a03583f7a717099fe5b08c813c898228ceeed8afac7b28d4bdb77fe9ac4e0 SHA512 95a9109217cf255e921bbf2504918345d1e32e454a8c44c726cb1df522cca73de785db31e9e71a88d3bfa802c49ae89caaa9c64edc3834c5b491ef15f853313e
-DIST gcr-3.38.1.tar.xz 1030360 BLAKE2B 474b501a5f6c339b0b4fb460a094dec6d5a297ca44daf050c6c88bc05ee822358309f57490f92c42f84a1e9f36a1d3c09c4b2788d7142ee5e86e2acf7987ea14 SHA512 4dc8c3f84023a7cd6f069f4529cb063d7153e589c2f9547410c7eeb5298dc238ea7fc4f22e22d8c237391f31bfcd814190e55125195f20b913665b9ca81d9c21
 DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81
-EBUILD gcr-3.38.1.ebuild 1846 BLAKE2B 7a5b4eccdf711025139adfd05032899d9d3394a6ccdf2439a1bf1e16934de8205f3e7a4cc2e0ecf059ad27ba2da0a867dcd80d7f31d20464b67c769cb8bedb2b SHA512 9974e119a8292d4fe1a37d09a0d830089fab446366b472e91a5da849b482ac24c6f48580d747063b1f31acedc1731be717d1cab93998aa4b6d6eb0881ac62041
-EBUILD gcr-3.40.0.ebuild 1805 BLAKE2B 38ee16038a5a1e0917aa3632b71d7e2da565c4b4abf7d489e1e089375f9b2175ed7fd28d36620d0c74e95856d9d88ba8b5e5f103e9117355f2c749637f1fb493 SHA512 fd3c86fdb248f1acb549096379769b2260578a520b924781e6b6e8ec8eb571b3e21c4116039e241b36ce2084a89cf58794383774c4400c8723618e3c85056e31
+EBUILD gcr-3.40.0.ebuild 1798 BLAKE2B 9491586e1c0d8bb0f564296fb9d922bfae752867b2a33a6adcdfc957c7f70b48516dd876d074ed90f4cf53cc3b4e018d707152fd3365141acec563a12c5da3db SHA512 26f8dc75e6578c8c1de2c7d46c74e6f725fe0b69e28c766e7a3226f9d32efc290d633306e6c3ba84137ccac2b1be20a8c7c3b9a3117cb7058e77152f5f1feefe
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch b/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch
deleted file mode 100644
index 5bb7da0fa787..000000000000
--- a/app-crypt/gcr/files/3.38.0-avoid-gnupg-circular-dep.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From b938b0b658852c682ae17d56e0ad9322611e9516 Mon Sep 17 00:00:00 2001
-From: Rasmus Thomsen <oss@cogitri.dev>
-Date: Wed, 11 Mar 2020 11:49:08 +0100
-Subject: [PATCH 1/2] meson: allow building without gpg(2) installed
-
-This avoids circular dependencies, such as gcr -> gpg2 -> pinentry -> gcr
----
- meson.build       | 7 +++++--
- meson_options.txt | 5 +++++
- 2 files changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index a26a0f9..02b4c3c 100644
---- a/meson.build
-+++ b/meson.build
-@@ -41,7 +41,10 @@ gobject_dep = dependency('gobject-2.0', version: '>=' + min_glib_version)
- gio_dep = dependency('gio-2.0', version: '>=' + min_glib_version)
- gio_unix_dep = dependency('gio-unix-2.0',version: '>=' + min_glib_version)
- glib_deps = [ glib_dep, gmodule_dep, gthread_dep, gobject_dep, gio_dep, gio_unix_dep, ]
--gpg_bin = find_program('gpg2', 'gpg')
-+gpg_path = get_option('gpg_path')
-+if gpg_path == ''
-+  gpg_path = find_program('gpg2', 'gpg').path()
-+endif
- libgcrypt_dep = dependency('libgcrypt', version: '>= 1')
- p11kit_dep = dependency('p11-kit-1', version: '>= 0.19.0')
- p11_system_config_modules = p11kit_dep.get_pkgconfig_variable('p11_system_config_modules')
-@@ -65,7 +68,7 @@ conf.set('HAVE_GETTEXT', true)
- conf.set('HAVE_LOCALE_H', cc.has_header('locale.h'))
- conf.set('HAVE_TIMEGM', cc.has_function('timegm'))
- conf.set('HAVE_MLOCK', cc.has_function('mlock'))
--conf.set_quoted('GPG_EXECUTABLE', gpg_bin.path())
-+conf.set_quoted('GPG_EXECUTABLE', gpg_path)
- conf.set_quoted('LIBGCRYPT_VERSION', libgcrypt_dep.version())
- config_file = configure_file(
-   output: 'config.h',
-diff --git a/meson_options.txt b/meson_options.txt
-index bbdc8e3..ae0f524 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -13,3 +13,8 @@ option('gtk_doc',
-   value: true,
-   description: 'Build the reference documentation (requires gtk-doc)',
- )
-+option('gpg_path',
-+  type: 'string',
-+  value: '',
-+  description: 'Path to gpg, autodetected if not set',
-+)
--- 
-2.26.2
-
diff --git a/app-crypt/gcr/gcr-3.38.1.ebuild b/app-crypt/gcr/gcr-3.38.1.ebuild
deleted file mode 100644
index 0a9c7d827500..000000000000
--- a/app-crypt/gcr/gcr-3.38.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
-
-DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
-
-IUSE="gtk gtk-doc +introspection test +vala"
-REQUIRED_USE="vala? ( introspection )"
-RESTRICT="!test? ( test )"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgcrypt-1.2.2:0=
-	>=app-crypt/p11-kit-0.19.0
-	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
-	>=sys-apps/dbus-1
-	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="app-crypt/gnupg"
-BDEPEND="
-	${PYTHON_DEPS}
-	gtk? ( dev-libs/libxml2:2 )
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.9
-		app-text/docbook-xml-dtd:4.1.2
-	)
-	>=sys-devel/gettext-0.19.8
-	test? ( app-crypt/gnupg )
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/3.38.0-avoid-gnupg-circular-dep.patch
-	"${FILESDIR}"/3.38.0-optional-vapi.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use introspection)
-		$(meson_use gtk)
-		$(meson_use gtk-doc gtk_doc)
-		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild
index 139bbe9e4c8a..781d04088abb 100644
--- a/app-crypt/gcr/gcr-3.40.0.ebuild
+++ b/app-crypt/gcr/gcr-3.40.0.ebuild
@@ -17,7 +17,7 @@ IUSE="gtk gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 DEPEND="
 	>=dev-libs/glib-2.44.0:2
diff --git a/app-crypt/gorilla/Manifest b/app-crypt/gorilla/Manifest
index c73281548b86..efc6b3c517aa 100644
--- a/app-crypt/gorilla/Manifest
+++ b/app-crypt/gorilla/Manifest
@@ -1,4 +1,4 @@
 AUX gorilla-script-destdir.patch 407 BLAKE2B 156782385c31eea65d35d37c506e900b575a83de54330cf2b8aa293266e717bc57e2e1e59255369b1e4a8e5ccec2ecbd45b5d3b0803876b8d75f854be2332238 SHA512 785cbdd268e73f9cdc2ae5e36c9ce6435dc173353e7df0d895195f77516867f7f57f9749a4cadb9c533c1d36985e919433a0ddb508125b8135054545e53d23a4
 DIST gorilla-1.4.tar.gz 190766 BLAKE2B f537ef4b7d7324dd04124450a8c84bd56fc52cc1f40669bda26c9770fc279a81d034e161807ab8b98a7ae779fe85b067f9ab8b7e208a656e96ac6922a8fb9bc9 SHA512 56328068506309e99f9bc8b095048840eabacb794c742b36c4b855501d2973646e6e5ef7755f0aa29e636c5f5463fa1b24f0f627cb691511e4a48e1f062ce44b
 EBUILD gorilla-1.4-r1.ebuild 742 BLAKE2B 1bc5dba05d378712a766301ebbd24bfac36cb7b2d2f8aee5c028e8aea422ea12e8578d7e2f879d92296f698b19aab3a51e8d80816a03a0f9c5fb1d8f02ab721b SHA512 1d8531a30d55f27308a5c67a72f4aa687a2061e1e5933eba14dc9d387c8e19c22c3f09eb26f470018f9d87f354421f61be03d11fcf80b113b43b7bf874372e16
-MISC metadata.xml 334 BLAKE2B 45e622a9f79f3401c1e38c260dc8714d74845202b24b6d0d30366254c9a3869342f21375d198ce14eb25a1e827e9c40147ab07ae15be5d9f4b938572ef6320fb SHA512 82e606fd71fd8dd152b2e3a0638a6d503789226dcf0fa89d25066af33ae8f648da132578bfa506c172596b0a265590428b6444bdeda54d98dc7f1e80b5939b54
+MISC metadata.xml 249 BLAKE2B 0ba61410e243dc73dc84727a1bf160b26662948053a95507b27ac1e46512f39a79ef39358676210cb0cc79c931ea08ab51cbdd78b65d8f0c9480bb42bc61ddc5 SHA512 5cbe5182c2a35c5d8a8fa49741b072bda662b224854149375a67559f2aa900c8ee52c5a4795a7aaf2b37df2420c9c27610739b0b90c3eec68dd0c2d0cba74032
diff --git a/app-crypt/gorilla/metadata.xml b/app-crypt/gorilla/metadata.xml
index a01eddb96726..aee5efdcff29 100644
--- a/app-crypt/gorilla/metadata.xml
+++ b/app-crypt/gorilla/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>patrick@gentoo.org</email>
-    <name>Patrick Lauer</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">zdia/gorilla</remote-id>
   </upstream>
diff --git a/app-crypt/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 7ab15a74d615..d89507c4fd90 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,4 +1,4 @@
 DIST hashcat-6.2.1.tar.gz 5815254 BLAKE2B b6ce0edf7a7fe725570e557b6b414c8aad02e24933b2610be2607c895778d635543a90806aa40c3521f83f93de3b7556f04274d4f9893dacb53af82974df0be2 SHA512 435d8c66e1de14a4a95364eb06f41d10d221c4cf3286bed5ce333d3d07fe7ec2097fa57a3f925ef108a0c17091a65dc18b9c782f69ab8c0575061c14c9354563
-EBUILD hashcat-6.2.1.ebuild 2736 BLAKE2B 505511065865f8c67b5fd057624841817a85971ee7cc22ed51da9dfff97006567ca7dd615e313c20a3ab7531891f67144dae16dd027adc94787840b2dcfdd0c0 SHA512 bc1c70ed0344879af8667ee193b7fb0ca10e49115728e19c43960a5385e6063558619e137c727dc9c29781243dc72fba680b329347dd015ccf430a0ad69c93ab
-EBUILD hashcat-9999.ebuild 2736 BLAKE2B 505511065865f8c67b5fd057624841817a85971ee7cc22ed51da9dfff97006567ca7dd615e313c20a3ab7531891f67144dae16dd027adc94787840b2dcfdd0c0 SHA512 bc1c70ed0344879af8667ee193b7fb0ca10e49115728e19c43960a5385e6063558619e137c727dc9c29781243dc72fba680b329347dd015ccf430a0ad69c93ab
+EBUILD hashcat-6.2.1-r1.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
+EBUILD hashcat-9999.ebuild 2778 BLAKE2B b7cc13c326c8e16e014a47587cfe1fd13655f541b61c6775ab272980fd4d6e8bd57065a85019fce9f8336df325a78275b5302efe0d282cd72c3bdd6b7e93115e SHA512 bcc110789c5a260a9a6f2deb2bc4649a058cb940bf4f6ca71f4d7c24030ca87417ccfa9207727929916e8e871dc5fc526fb13d4a26af27e278e45acddef68b5f
 MISC metadata.xml 395 BLAKE2B fc7a2bac75e2c4805d002a30364e4f0e20ef972e1c8c91dc1ef3fb2f55914b8fc717a3a9502f064a19e6b0e590db779c650eab94c7b819a497a1d7ec41a78771 SHA512 6476fd0ec2f099314595408d6a593d74d126be57edc651ae5180dc8f36ae26f9db947b038e7d08f4e3f856ea9750f7bfc814f8e31d8ba829258a4dcdef5af75d
diff --git a/app-crypt/hashcat/hashcat-6.2.1.ebuild b/app-crypt/hashcat/hashcat-6.2.1-r1.ebuild
index dc3813e63de6..1adb6223b74a 100644
--- a/app-crypt/hashcat/hashcat-6.2.1.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.1-r1.ebuild
@@ -60,13 +60,14 @@ src_prepare() {
 src_compile() {
 	tc-export CC CXX AR
 
+	# Use bundled unrar for now, bug #792720
 	emake \
 		SHARED=1 \
 		PRODUCTION=1 \
 		ENABLE_BRAIN=$(usex brain 1 0) \
 		USE_SYSTEM_LZMA=0 \
 		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_UNRAR=0 \
 		USE_SYSTEM_ZLIB=1 \
 		USE_SYSTEM_XXHASH=1 \
 		VERSION_PURE="${PV}"
diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild
index dc3813e63de6..1adb6223b74a 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@@ -60,13 +60,14 @@ src_prepare() {
 src_compile() {
 	tc-export CC CXX AR
 
+	# Use bundled unrar for now, bug #792720
 	emake \
 		SHARED=1 \
 		PRODUCTION=1 \
 		ENABLE_BRAIN=$(usex brain 1 0) \
 		USE_SYSTEM_LZMA=0 \
 		USE_SYSTEM_OPENCL=1 \
-		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_UNRAR=0 \
 		USE_SYSTEM_ZLIB=1 \
 		USE_SYSTEM_XXHASH=1 \
 		VERSION_PURE="${PV}"
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index ecd71e2a83a8..8fe86182e807 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,4 +1,4 @@
 AUX libsecret-0.20.4-meson-build-test-vala-unstable-with-DSECRET_WITH_UNS.patch 1316 BLAKE2B 0c0fb8c10d869ff98d0644067336e54f907904ed8c4899e58e5d65aa84406442a550a6d4d6939cc34d5f6a80ec5d1d96dc7dcc91e44e955a8eef9b272f2fef6f SHA512 e2e4474a2af3e6f8a5bde2eff58417991b3d85f3042fe77776815f86567094168ca01c25f101cbc82a5f66573b1bc4592e6dee6b1be082fb8ec612c1394a7ce9
 DIST libsecret-0.20.4.tar.xz 529916 BLAKE2B d5922dcb1eb27e4cc6bc7770926fc3191c9f4634867ff9682fd33f9373d6fa2d334c9c1b995bd208bbf178af008ec7b224bd5388427617fbd7e48d05d2e35823 SHA512 599482796af001703c25d181a710c5a3207f44d4d0036ef2001cc541bde9ef453172b71df9bb214d27d1fbd2f28c1b5a5efdbd5faca3561188c07dccdc7d7c15
-EBUILD libsecret-0.20.4.ebuild 2599 BLAKE2B 1b5a416e13a06cbf8c09cd97475bfc32d074153b9de3369d2afa98b06ed89da3e5ab8150191371c55806a11071b063b1113afc10d1c01b3a0da87b1556fd1ec9 SHA512 ed4ca28998fbd2792a3edaf0286e127189163b1bc888a7fe5ba11eab8212a1f27cf4b4a578dc93719a6ccef7ce89a0ccee290e5b3ceab135177df3dc556a9e15
+EBUILD libsecret-0.20.4.ebuild 2606 BLAKE2B ef903f044a985c51a9cc536fd035deb8f4c5e960b1353ace28a8dcbca6d8af0bd31bc9dddf220b0facd6d911a0aa9e35e2057dcc1c4fcca3adaaccc66ed741c5 SHA512 05238d442f02dad738fbb310d45a76e9cbc782f700d7ea3d2d7b5b6287a2a3901f6d425a058905c11d34acaac8677933fcaaa497f7e72a6be8223ebcf4fcec19
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/app-crypt/libsecret/libsecret-0.20.4.ebuild b/app-crypt/libsecret/libsecret-0.20.4.ebuild
index 4b2b1102f1a7..fc8e3656fc55 100644
--- a/app-crypt/libsecret/libsecret-0.20.4.ebuild
+++ b/app-crypt/libsecret/libsecret-0.20.4.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
 	gtk-doc? ( crypt )
 "
 
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.44:2[${MULTILIB_USEDEP}]
diff --git a/app-crypt/minisign/Manifest b/app-crypt/minisign/Manifest
index d9b9301cdb15..8e9a1eb28a2f 100644
--- a/app-crypt/minisign/Manifest
+++ b/app-crypt/minisign/Manifest
@@ -1,4 +1,4 @@
 DIST minisign-0.9.tar.gz 15664 BLAKE2B f9f358a27b069e752894326932a8c5c51f308ade49ed7088a5f693b4e8327639fc5578607f348994a7ab7484091ed93190894c1965cadbbbf2a27e939ccc117b SHA512 7970f3e72ff759f3f02416de5d6035e1c8dd4e92ea718083cc5091c7e2355b59c4e178c60ca934985ba1e1afcd970967d4fb39a434ba54b140f3fc9be661253d
-EBUILD minisign-0.9.ebuild 706 BLAKE2B c999ddcc6531a96353a39d83b1ce76f86a12055209ac033d45ff969f913649d0ebda3db39ce41cde186264383ebd20c440842ec3265160bcc7f21ee2f7c209d2 SHA512 9fcfc8f0a7c19609ab8559460cbeb6a7809068332aa30b33ccfbd80b3bfb111c0cdf95e9a856a64ddecb28f186373c0c0c424ce16a99fbca9c0cc2e594581d54
+EBUILD minisign-0.9.ebuild 712 BLAKE2B f05a904c1f95ecbfa0ff8ecb9bb655b219e97b1276c47ecfbd1e262920080fc425cf49106f1f1990f31623635334e65c6f6fdc34d62af9fbc88a3ebdd2b32368 SHA512 95ab9312bce7a0d1f27d60b7150099fc50ea44fa7717749d993776a8124951323660086deb0f123de8dd3ae2823fe20d91110f93cf83b89d32c166c46e22cf15
 EBUILD minisign-9999.ebuild 665 BLAKE2B 20395e22436151cbacb842badbf83ee829cdc278ac129b08db475cc87d35f7294097f87e4780a63a208d63b3f31edd244fb2da471d1de1dc95f744094c11f784 SHA512 b336ec7821b270de6f7b6a82d029cafde41ee685cd6a376d077e82451a6d223f0b0b5b6fbec6e994e009b8157b42d31c4ed7f0240b57a2877ffdb369742ff4a1
 MISC metadata.xml 681 BLAKE2B 590bbd6d73e1a9d5ac5e3381ffa5f29e8f8a0f329874e5372f52425a679c8966211b689a699d75cd6bc299e6d670f7724284fd87fc8f6ce0f8038133dfcc33eb SHA512 2840cf105039a5bb4a7564f4d10f759c1cf0f7f183a9684fabc2a1a158ea01a8dc7c552bad57991b30bf676c88b2b00d1f7304a2c565d388e798cf931e566242
diff --git a/app-crypt/minisign/minisign-0.9.ebuild b/app-crypt/minisign/minisign-0.9.ebuild
index 234a13f4d642..cf275ac7cac2 100644
--- a/app-crypt/minisign/minisign-0.9.ebuild
+++ b/app-crypt/minisign/minisign-0.9.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="ISC"
diff --git a/app-crypt/openpgp-keys-crypto++/Manifest b/app-crypt/openpgp-keys-crypto++/Manifest
index d1241a99df85..ab286d5bb095 100644
--- a/app-crypt/openpgp-keys-crypto++/Manifest
+++ b/app-crypt/openpgp-keys-crypto++/Manifest
@@ -1,3 +1,3 @@
 AUX openpgp-keys-crypto++-noloader.asc 1306 BLAKE2B bfff5f841b3e320423db010d02cbea642c8344cb23637616af0e626c31525a8e74f5b0a5757f1f8135204f8eb7319808cd31b5f9134ef85df83aa93ef7ef459b SHA512 1f99c41a2e6854c143a75240cba02a930db6743b904f1af4b7a16210b1d751885b7a9180ae79f0f1fe214c95c2fa0ae29b674c7be3fef547fc17400be0a49f61
-EBUILD openpgp-keys-crypto++-20210416.ebuild 769 BLAKE2B 07789a43756d89a79bd595b3d32dafd936e6961828bceca748bdb67c2f3b3e86194d3470d105743f3eb6a27821b9a28daaceda84c159cd6b5010aba279fe8737 SHA512 8a19e33ce9e746bb762350c7451131c6d9486604fd7bcabe98afe4a69cc03a1094d02c5e0b01f88fcdd8179a609d4561aa1e88b3bea8e342fc498420647e0119
+EBUILD openpgp-keys-crypto++-20210416.ebuild 763 BLAKE2B 6ae842b28ac47c4ff42a10d00ea79fecb43e6e43bc60006deacc325c0b44844bb3d49064216fc3683737fc0c28f9755b479be1e63d3f9e9ae5b14cd1249b4f5e SHA512 713f08ec612ce0f92c4a7191b164f9c3a567864179567d2bae5b17feb51e151991cbe5addd49afc9bd438d076973f8e80c1ebc242fe02c5b2f006ebd2f8db38f
 MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/app-crypt/openpgp-keys-crypto++/openpgp-keys-crypto++-20210416.ebuild b/app-crypt/openpgp-keys-crypto++/openpgp-keys-crypto++-20210416.ebuild
index 6de1b2391896..87a8a0a4c1db 100644
--- a/app-crypt/openpgp-keys-crypto++/openpgp-keys-crypto++-20210416.ebuild
+++ b/app-crypt/openpgp-keys-crypto++/openpgp-keys-crypto++-20210416.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	# Note: Currently Jeffrey Walton (noloader) makes releases, but may need to add
diff --git a/app-crypt/openpgp-keys-mlichvar/Manifest b/app-crypt/openpgp-keys-mlichvar/Manifest
index 8aef7a56fcfa..2fd403fa7b3f 100644
--- a/app-crypt/openpgp-keys-mlichvar/Manifest
+++ b/app-crypt/openpgp-keys-mlichvar/Manifest
@@ -1,5 +1,5 @@
 DIST openpgp-keys-mlichvar-20210416.asc 1672 BLAKE2B 62af2374a607f5d1840aff3e296b3daf37a91bd4c8148b8c86c709eb59de21ab981984296f578304f19436cdd6e3846b442a6b6313b217951379fac96b686522 SHA512 dbf4ef590318ce4429c196259573bdaa3557a131e7f0914fda7192665c5046f5e90d99cf637977affe030dd305e865230e111ea00a6601186bde43b21a8a724e
 DIST openpgp-keys-mlichvar-20210513.asc 3285 BLAKE2B 3ba5046e98eafe52eae126d0e05cda195f12a20a15c3cfe92cffc25a7d339418931e4e72ba2a36d5ae614b6f7a96a923495592419c09dfe712dbdcac80cb2624 SHA512 8cedd37e6a42b21e71fa5c8779300e65fdc078d41fb750abd07bd8f6f1cd41bc54814c021f6fd3d25e67190e84aa45d37735ea03325dbc5e77582506fa4b8b9b
 EBUILD openpgp-keys-mlichvar-20210416.ebuild 601 BLAKE2B df2b4eb3a34d6d50ea3df0b4c5bcd7bca490cb111e08671e582902e85de98776bf24c0d91360b269d77c4534548cfce677855157b52089637bb43b3e08ca444f SHA512 a08cc80fc7273ed0790c19e4bb248f062b7d26617633cec2b4a69579876d16b9a258987e4bd838f00d4316e81caf170505c6bb6225835f540260cd53d913d864
-EBUILD openpgp-keys-mlichvar-20210513.ebuild 601 BLAKE2B 56e8bac1f65f32bc857041a77a059d68d42594466a2e83f6133ae03ff22d1dd87b3199c428e49eea6a783a2f0154850f903b1c6db3d65134fe5170b21e78e723 SHA512 eca4a03d96e261baeefb776c413a12c514be7c7c7880bd0f545e7d672fb1fc6c46a400a4555915e883c075c0662b6635a67b03bce840bcacafab7991611f401c
+EBUILD openpgp-keys-mlichvar-20210513.ebuild 609 BLAKE2B 4cc4cf8ca31c41a4245dd91c671506349987a9cf268ac2c732eae0c20bc205207bb693c008533341c9788cad1f6886f7d522613d6d93507ea5ed2d0816117134 SHA512 b4872c2e1a178103b1ff529ee3dbf53c88195e5214fe2e03fd42686c56f2d5b6c947673be3636c39128ddc9aa8470c8d21743f0e14dfe7ccf9b1f90cab13c621
 MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild b/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
index 3a816580475f..cbfc52603f9c 100644
--- a/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
+++ b/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/app-crypt/openpgp-keys-oletange/Manifest b/app-crypt/openpgp-keys-oletange/Manifest
index c11fb9f193c8..eb42c218c7db 100644
--- a/app-crypt/openpgp-keys-oletange/Manifest
+++ b/app-crypt/openpgp-keys-oletange/Manifest
@@ -1,3 +1,3 @@
 AUX CDA01A4208C4F74506107E7BD1AB451688888888.asc 15261 BLAKE2B cfdfcc53138f4ef91db6995ef145098cd048569045430097bb229771ec2d0f00dacb408f0b0386162094325c876a7232757f23f1886c77184709aa942be05e59 SHA512 4552bbb53806d221c42f3613445c0a4ef24b3edfdaaf4ab2ec6a24b5af52269df3be209debafdca86d16e88f8abf1da696a603fc3d62da27c79bf9c0c9098eea
-EBUILD openpgp-keys-oletange-20210423.ebuild 542 BLAKE2B e990639f1e97bdeaef736874306a679dceb482a9107721a9a563440b83a8ffc05e9429ce8914ef1a52245a662863efe88cb066ec337df89275ce9ffb72057017 SHA512 fd78559ea1795e66ec1ff3c59007ca05e913131f1507d4ba1332b3b2d29b6ab4609045195795529edbf2495d904367c90358dd7c5df4151118e491a92980d595
+EBUILD openpgp-keys-oletange-20210423.ebuild 538 BLAKE2B dc7b1c8c6d250bf79eae857c2009b91a752ec6f602402c34ae5a8e7a95c871c0b49564c7d2cac6a082e54c0fa21dc79e7e02530de2ee58eb16d0163867e7cede SHA512 6032378b110513709f933a5ae3f8bd7a5887ea04f4228d414e829faba38cb14ce88958830d97f3f25d58b355ba3aad521c37cb415146c0e2a83bd0d4e36d96fb
 MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/app-crypt/openpgp-keys-oletange/openpgp-keys-oletange-20210423.ebuild b/app-crypt/openpgp-keys-oletange/openpgp-keys-oletange-20210423.ebuild
index 45f008982e3e..5f6d98575584 100644
--- a/app-crypt/openpgp-keys-oletange/openpgp-keys-oletange-20210423.ebuild
+++ b/app-crypt/openpgp-keys-oletange/openpgp-keys-oletange-20210423.ebuild
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 
 src_install() {
 	local files=(
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
diff --git a/app-crypt/tpm2-tss-engine/Manifest b/app-crypt/tpm2-tss-engine/Manifest
index 7634b44a4641..4648e488c985 100644
--- a/app-crypt/tpm2-tss-engine/Manifest
+++ b/app-crypt/tpm2-tss-engine/Manifest
@@ -1,3 +1,3 @@
 DIST tpm2-tss-engine-1.1.0.tar.gz 394448 BLAKE2B 0502907dc9ce872f31be3b980f975a02af2e3e4b369d188afa5327bd4475d93dbf43769dc7ddc11e8cbda8d1fde09f28a9aef9145e859a90225cd397f62c7a2c SHA512 5d2e08178be54350e8672245023d601a0d9d520f8c49e977af49d7c59b91d033c14b4a347b71e042fe7c5ff12af9fcc43b69fd1dc83a9f0db12d47d43e1107f4
-EBUILD tpm2-tss-engine-1.1.0.ebuild 824 BLAKE2B 468c0e8f67cf86c2b7aec7466bcba1ef7180ac24c73f1716510a53f79f0f0aaffa5df7d80276ddf9a6784dae9661650c11bf858fb03734918bc0d618f785e428 SHA512 b4a7b735533ffe077aad28c0cae60f0e611fe5b58b8dbd0bd87195e19a76d8dde7506f115f29ff86e4b93a7e3de8cc5fe923eb65db0e11ab9a058a6ba9793193
+EBUILD tpm2-tss-engine-1.1.0.ebuild 829 BLAKE2B 0339df20bb889c14d972dccbccb73f15d670b2f30825df868f649f830c4e1e8326da6fd5bf1b03167577a1a2d5122dacbd028992385329826d630d63c9311522 SHA512 5bca61532e4a5d00cebe78b6ac87d4aaa4ac3e95656a672b35d04efbc763cc99b0a0aef5eceb114382374a3bdf106a4ba5f17db92d816f20d695af65c9072cea
 MISC metadata.xml 497 BLAKE2B 98207e2376eb416b503f14f6bc6158bbe9f284fc88727d89a8823cfc2b4841276faab3b47df3230fa859b3235ae13a0ea99f6f8d75ef76b43075cade46302667 SHA512 81c6cfe30f368e282005fba3a53d1b7e9947ca7b3f88fce3a17a41ac522d61d43f0b6a41c12b6ce5207e228f88ea11d0416f4f21574dc6b4527f4172a0417e61
diff --git a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild
index 3a7aa01ae008..00b662bda57d 100644
--- a/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.ebuild
+++ b/app-crypt/tpm2-tss-engine/tpm2-tss-engine-1.1.0.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit autotools bash-completion-r1
 
 DESCRIPTION="OpenSSL Engine for TPM2 devices"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
+HOMEPAGE="https://github.com/tpm2-software/tpm2-tss-engine"
 SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"