gentoo resync : 22.05.2021

34 files changed, 264 insertions, 35 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 9509877dca24..9a4eccd2af20 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest
index 20593497db38..214591951964 100644
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@@ -3,5 +3,5 @@ AUX 3.38.0-optional-vapi.patch 2278 BLAKE2B 7011aec6831b9488ba19efd41b6f3772af10
 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 1798 BLAKE2B f0bd866c565f231cae3672711f1b1e72a126f9bc8ca539c8b092478cf6c7f0b8f08a288a5b9dcde76128b93b536d3734ecd28a3850b4507e905bdaa027341505 SHA512 1b5855989a9abd2c94425bf71c7e4a16c6184c1d0a7cd2db389e57a643d79ef082d1f09ca97c05f95b174dbd5ba30bbdd9c2eb0da4840630553bf0464e299791
+EBUILD gcr-3.40.0.ebuild 1805 BLAKE2B 38ee16038a5a1e0917aa3632b71d7e2da565c4b4abf7d489e1e089375f9b2175ed7fd28d36620d0c74e95856d9d88ba8b5e5f103e9117355f2c749637f1fb493 SHA512 fd3c86fdb248f1acb549096379769b2260578a520b924781e6b6e8ec8eb571b3e21c4116039e241b36ce2084a89cf58794383774c4400c8723618e3c85056e31
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-crypt/gcr/gcr-3.40.0.ebuild b/app-crypt/gcr/gcr-3.40.0.ebuild
index 1cc41b03fc6d..139bbe9e4c8a 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 ~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/hashcat/Manifest b/app-crypt/hashcat/Manifest
index 9804456f81eb..7ab15a74d615 100644
--- a/app-crypt/hashcat/Manifest
+++ b/app-crypt/hashcat/Manifest
@@ -1,4 +1,4 @@
-DIST hashcat-6.1.1.tar.gz 5385180 BLAKE2B a1a90f691222c7810150a23d513bd1d24bca4682dd8dec2ff5bdc9cc9f82d5a2b00407de966a7c7db131cf1c1709b5f78c97d45176598d6bb7ebd381c38b4ba8 SHA512 788539b488ba55684d6d93ce18f3b05fa822a8cbfcdbcde9c2b54001d8927580dca253e0e9ff9a19f4278045046d732e104054fc743c39f47952ca24d2e93724
-EBUILD hashcat-6.1.1.ebuild 2288 BLAKE2B 918da55148fdf18985a059fe0a824237d314b26f5891d92fbe5d1fa3b4a12fd2bf34f5bf2158658057df93a4072b2de35f2c78e2bd97c211e8bb1afd809d469e SHA512 c1111b5c454ba44430eb17b62a53b3c6cb5d5347481d4efe9db02208cfca9ccd3252b21f5625a13c13f23e71c42122271a625bdca5990632a47a74ada15e8f7e
-EBUILD hashcat-9999.ebuild 2288 BLAKE2B 918da55148fdf18985a059fe0a824237d314b26f5891d92fbe5d1fa3b4a12fd2bf34f5bf2158658057df93a4072b2de35f2c78e2bd97c211e8bb1afd809d469e SHA512 c1111b5c454ba44430eb17b62a53b3c6cb5d5347481d4efe9db02208cfca9ccd3252b21f5625a13c13f23e71c42122271a625bdca5990632a47a74ada15e8f7e
+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
 MISC metadata.xml 395 BLAKE2B fc7a2bac75e2c4805d002a30364e4f0e20ef972e1c8c91dc1ef3fb2f55914b8fc717a3a9502f064a19e6b0e590db779c650eab94c7b819a497a1d7ec41a78771 SHA512 6476fd0ec2f099314595408d6a593d74d126be57edc651ae5180dc8f36ae26f9db947b038e7d08f4e3f856ea9750f7bfc814f8e31d8ba829258a4dcdef5af75d
diff --git a/app-crypt/hashcat/hashcat-6.1.1.ebuild b/app-crypt/hashcat/hashcat-6.2.1.ebuild
index 4bcf042ea7e7..dc3813e63de6 100644
--- a/app-crypt/hashcat/hashcat-6.1.1.ebuild
+++ b/app-crypt/hashcat/hashcat-6.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pax-utils multilib
+inherit pax-utils toolchain-funcs
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
@@ -20,6 +20,8 @@ fi
 IUSE="brain video_cards_nvidia"
 DEPEND="
 	app-arch/lzma
+	app-arch/unrar
+	sys-libs/zlib[minizip]
 	brain? ( dev-libs/xxhash )
 	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
 						|| ( dev-util/nvidia-cuda-toolkit
@@ -29,24 +31,46 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	#remove bundled stuff
+	# remove bundled stuff
 	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
 	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
 	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
 	#rm -r deps || die "Failed to remove bundled deps"
-	#do not strip
+
+	# do not strip
 	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
+	# do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
-	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	export PREFIX=/usr
+	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+	# respect CC, CXX, AR
+	sed -i \
+		-e 's/:= gcc/:= $(CC)/' \
+		-e 's/:= g++/:= $(CXX)/' \
+		-e 's/:= ar/:= $(AR)/' \
+		src/Makefile || die
+
+	export PREFIX="${EPREFIX}"/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
 	default
 }
 
 src_compile() {
-	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}"
+	tc-export CC CXX AR
+
+	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_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}"
+
 	pax-mark -mr hashcat
 }
 
@@ -68,5 +92,16 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}" install
+	emake \
+		DESTDIR="${ED}" \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}" \
+		install
 }
diff --git a/app-crypt/hashcat/hashcat-9999.ebuild b/app-crypt/hashcat/hashcat-9999.ebuild
index 4bcf042ea7e7..dc3813e63de6 100644
--- a/app-crypt/hashcat/hashcat-9999.ebuild
+++ b/app-crypt/hashcat/hashcat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit pax-utils multilib
+inherit pax-utils toolchain-funcs
 
 DESCRIPTION="World's fastest and most advanced password recovery utility"
 HOMEPAGE="https://github.com/hashcat/hashcat"
@@ -20,6 +20,8 @@ fi
 IUSE="brain video_cards_nvidia"
 DEPEND="
 	app-arch/lzma
+	app-arch/unrar
+	sys-libs/zlib[minizip]
 	brain? ( dev-libs/xxhash )
 	video_cards_nvidia? ( >x11-drivers/nvidia-drivers-440.64
 						|| ( dev-util/nvidia-cuda-toolkit
@@ -29,24 +31,46 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	#remove bundled stuff
+	# remove bundled stuff
 	rm -r deps/OpenCL-Headers || die "Failed to remove bundled OpenCL Headers"
 	rm -r deps/xxHash || die "Failed to remove bundled xxHash"
+	# TODO: Gentoo's app-arch/lzma doesn't install the needed files
 	#rm -r deps/LZMA-SDK || die "Failed to remove bundled LZMA-SDK"
 	#rm -r deps || die "Failed to remove bundled deps"
-	#do not strip
+
+	# do not strip
 	sed -i "/LFLAGS                  += -s/d" src/Makefile
-	#do not add random CFLAGS
+	# do not add random CFLAGS
 	sed -i "s/-O2//" src/Makefile || die
-	sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
-	export PREFIX=/usr
+	#sed -i "#LZMA_SDK_INCLUDE#d" src/Makefile || die
+	# respect CC, CXX, AR
+	sed -i \
+		-e 's/:= gcc/:= $(CC)/' \
+		-e 's/:= g++/:= $(CXX)/' \
+		-e 's/:= ar/:= $(AR)/' \
+		src/Makefile || die
+
+	export PREFIX="${EPREFIX}"/usr
 	export LIBRARY_FOLDER="/usr/$(get_libdir)"
-	export DOCUMENT_FOLDER="/usr/share/doc/${P}"
+	export DOCUMENT_FOLDER="/usr/share/doc/${PF}"
+
 	default
 }
 
 src_compile() {
-	emake SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}"
+	tc-export CC CXX AR
+
+	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_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}"
+
 	pax-mark -mr hashcat
 }
 
@@ -68,5 +92,16 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR="${ED}" SHARED=1 PRODUCTION=1 ENABLE_BRAIN=$(usex brain 1 0) USE_SYSTEM_LZMA=0 USE_SYSTEM_OPENCL=1 USE_SYSTEM_XXHASH=1 VERSION_PURE="${PV}" install
+	emake \
+		DESTDIR="${ED}" \
+		SHARED=1 \
+		PRODUCTION=1 \
+		ENABLE_BRAIN=$(usex brain 1 0) \
+		USE_SYSTEM_LZMA=0 \
+		USE_SYSTEM_OPENCL=1 \
+		USE_SYSTEM_UNRAR=1 \
+		USE_SYSTEM_ZLIB=1 \
+		USE_SYSTEM_XXHASH=1 \
+		VERSION_PURE="${PV}" \
+		install
 }
diff --git a/app-crypt/openpgp-keys-danielveillard/Manifest b/app-crypt/openpgp-keys-danielveillard/Manifest
new file mode 100644
index 000000000000..d17149f4d302
--- /dev/null
+++ b/app-crypt/openpgp-keys-danielveillard/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-danielveillard-20210514-DB46681BB91ADCEA170FA2D415588B26596BEA5D.asc 6275 BLAKE2B d4c8a9fbe923b4d8491434df59a63f359d40b7d442849874f57e88d31146b8819de52d444b000ad2d979226ed42003b632e936a05b6a5484efb24282a9d04b26 SHA512 38f2453d851c8c14ddd54e99148e04e36a4f66f2b13f14982411b01656771b32fd5e4bab7d4a526e7c060d6bbce58386a2d2fc2bb9af02b2c7c3140b2217fb64
+EBUILD openpgp-keys-danielveillard-20210514.ebuild 598 BLAKE2B 2da0726780ad9b802b4d43b0898c0f8503187c196a751659832128828d1788c3f6f89b62af526651a85f5fe17458a8bba180209b114a82664059b61200865857 SHA512 22417b9a7997c04cb53a7f8f0d4815a9eaab8e5a76421795cb861c53e2b5d86bcc5fe77750dbf920c2b23d4e6b3ba8d205f5b7652d3befa998a6ba81a8b85fae
+MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/app-crypt/openpgp-keys-danielveillard/metadata.xml b/app-crypt/openpgp-keys-danielveillard/metadata.xml
new file mode 100644
index 000000000000..a1af484833bd
--- /dev/null
+++ b/app-crypt/openpgp-keys-danielveillard/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-danielveillard/openpgp-keys-danielveillard-20210514.ebuild b/app-crypt/openpgp-keys-danielveillard/openpgp-keys-danielveillard-20210514.ebuild
new file mode 100644
index 000000000000..4a6ff876406e
--- /dev/null
+++ b/app-crypt/openpgp-keys-danielveillard/openpgp-keys-danielveillard-20210514.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used by Daniel Veillard"
+HOMEPAGE="http://veillard.com"
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-DB46681BB91ADCEA170FA2D415588B26596BEA5D.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+
+	insinto /usr/share/openpgp-keys
+	newins - danielveillard.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/app-crypt/openpgp-keys-gentoo-auth/Manifest b/app-crypt/openpgp-keys-gentoo-auth/Manifest
index 0b5e290a14d2..89b69e231029 100644
--- a/app-crypt/openpgp-keys-gentoo-auth/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-auth/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-auth.asc.20200704.gz 4540 BLAKE2B 8ae8a1947ae81e89aef6171b228e97a80331cc58336a0387bbda7c885ec5fff322d17b7fc462d7f3fe88a965455b94d1e16b705903843d75fa53481d525a1965 SHA512 da7d1aa76ea04f465e690560dd2d09306aa120b9f2771abc6fe06d5181c39c9e7db73ae0b9c01b864ccdd55a881a7e9c9716dd87446c809b901bb17c448878f5
 EBUILD openpgp-keys-gentoo-auth-20200704.ebuild 787 BLAKE2B e6afcf6f1d54482cdf505e69a02db3cb266a926859a7c056470974c37491b90db68c06c530bbca800ca9b5d2b2461c5811eb76f5677cd6f83ca683622dd31c93 SHA512 a170e47edfab5095c882994f6d9a9399754e130f768c444a912c96a442af67bb9777c1dbd144d1e137e384566ac84217ffd7bbffaa8ab9a70bb960b640d48485
-MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
+MISC metadata.xml 271 BLAKE2B 21ff27fce9fb36fa286e0cb5324edaf0721e2315d14456c837330d40dabd66369da85b94fc33169ae0caf233d634dd6fd2c29c37c0a78e38307e4adc134381ae SHA512 fa6aa60030292b6236a4b68b26095c3eea1b8dc1decc2be6b36ebb33979c52c39915e6169bfb54ad6f3a8380b1decc23d62f079b134484d97587ab64aa2e1663
diff --git a/app-crypt/openpgp-keys-gentoo-auth/metadata.xml b/app-crypt/openpgp-keys-gentoo-auth/metadata.xml
index 0319eec4c8be..5a5a3aaf4299 100644
--- a/app-crypt/openpgp-keys-gentoo-auth/metadata.xml
+++ b/app-crypt/openpgp-keys-gentoo-auth/metadata.xml
@@ -5,4 +5,5 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-libidn/Manifest b/app-crypt/openpgp-keys-libidn/Manifest
new file mode 100644
index 000000000000..77c5e632bb82
--- /dev/null
+++ b/app-crypt/openpgp-keys-libidn/Manifest
@@ -0,0 +1,4 @@
+DIST openpgp-keys-libidn-20210517-simonjosefsson-0424D4EE81A0E3D119C6F835EDA21E94B565716F.asc 5925 BLAKE2B 50df50ba10a69f0be231356f319036083c7f7198e8caa757b1766538b5e34114291cdb47ba3a8d880e2143d3e93e98ad99e4c3f7221a5f51c755db7456b00439 SHA512 35f629f471220c9179bfd2919277495c4de3264bf1270ef0a1839e6d3e864fb09479ab82a5f5f612c5955697ce78c411244a8f8b48c0c4f5f53e2bfb2ade78b5
+DIST openpgp-keys-libidn-20210517-timruehsen-99415CE1905D0E55A9F88026860B7FBB32F8119D.asc 5986 BLAKE2B d6bab47834e2ba470d3c8a0c1b72cdbb6d12423cdb66b6fa6db5f5dc52270315171a04989b838017418f7a6bd90417f3fc5249c0c4b1c6151e811bc46a180c97 SHA512 5980ae33d6158d34ad31f49eb8c4dac87a92ce37ee07f45e54388912fdf794c181e88118c5efa81d4e030795baa82140aa8f1123910746d978f02a9c04089436
+EBUILD openpgp-keys-libidn-20210517.ebuild 788 BLAKE2B 854481e89fa368f6198b8c18d0deec974ef6d4f1964acd0497c2d10af37810e3dfed918b5952146ffca4c57eb5b4fec0940a506513cb823b9ab158b5ac714229 SHA512 b0f1ca7abc2958fcfa3fe0403087f1c48eb55d34e1a5b51dee1860a1d51abdd6fc7adf73bbdce6202ab738dee71539a6d7840e3e6bc072c194bbfab3bc161ccd
+MISC metadata.xml 347 BLAKE2B 293e4cc6e22f51f47bf25f9be723ae443dd92138e6ddac7bfa4bbeb314a823dcf62429551125167fdc41e1031050f5baf034f493daa1cfa0aaa3fd824a4ddea7 SHA512 8fc22ee1c8de823f07c90e20c8075ef00ad130c07f5e556f61b501e4b162992050cbbfd6ad492b551464370f8d90382f3243d93830be92ccef6bd54481dd6bdd
diff --git a/app-crypt/openpgp-keys-libidn/metadata.xml b/app-crypt/openpgp-keys-libidn/metadata.xml
new file mode 100644
index 000000000000..ea877bdda085
--- /dev/null
+++ b/app-crypt/openpgp-keys-libidn/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-crypt/openpgp-keys-libidn/openpgp-keys-libidn-20210517.ebuild b/app-crypt/openpgp-keys-libidn/openpgp-keys-libidn-20210517.ebuild
new file mode 100644
index 000000000000..8ef1e736469c
--- /dev/null
+++ b/app-crypt/openpgp-keys-libidn/openpgp-keys-libidn-20210517.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used to sign libidn releases"
+HOMEPAGE="https://www.gnu.org/software/libidn/"
+# Simon Josefsson
+SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-simonjosefsson-0424D4EE81A0E3D119C6F835EDA21E94B565716F.asc"
+# Tim Rühsen
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-timruehsen-99415CE1905D0E55A9F88026860B7FBB32F8119D.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+
+	insinto /usr/share/openpgp-keys
+	newins - libidn.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/app-crypt/openpgp-keys-linuxcontainers/Manifest b/app-crypt/openpgp-keys-linuxcontainers/Manifest
index 1e9afe17e9ff..61eb0d549f1b 100644
--- a/app-crypt/openpgp-keys-linuxcontainers/Manifest
+++ b/app-crypt/openpgp-keys-linuxcontainers/Manifest
@@ -1,4 +1,4 @@
 DIST 64792D67.asc 91149 BLAKE2B 06c03b71dfd6242d8b33c4a2eeac02099a0a5139aa9fc7d82e2fae0dc78473b683bd5aa89ac4289576bb05d45dbb183007d7b488bf1c4cfaff4e307f75198af8 SHA512 838d18d84f3dd1199c5f811beedd083d2b704a99c5647dee543386f9c8cb05eadac3f987247aa11db240e5cd285dc2ef5c6f708a16f36abab41debf2a442b73b
 DIST FEA93624.asc 62695 BLAKE2B 93aee7b0a6a0eedc5c0695c5389122b4daed62a5c1c875815a798d844c89f82485362ff157a82c29a6b252956734ba88b55482376fe19a9ef8875cdd964fcdde SHA512 1b7f48fd145243773a0523e7b6d3f834377c299c06a2675da308d1b78b36c48a09277ec438b92bb55ca579dfb923f01f08df7471a7155532cbd60415f4db0430
 EBUILD openpgp-keys-linuxcontainers-20201014.ebuild 726 BLAKE2B e56defb975ccae9f99ebfc98428d5fc4c7104394005f1874226e7289a4e141e8493a22bb12db1a20c94b90d02b5f5a003a6d557527ee3461c2a99dc2e23d0603 SHA512 ff607706aabbb0554f630b51ac0d64f28e4484a2c4571b5e0a6d05640720c326902303b72b90b52f2b5884d03175442d78991eb6c66cba378774720b203dc8f0
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/app-crypt/openpgp-keys-linuxcontainers/metadata.xml b/app-crypt/openpgp-keys-linuxcontainers/metadata.xml
index 6b0a0fb3a729..0bd14750c669 100644
--- a/app-crypt/openpgp-keys-linuxcontainers/metadata.xml
+++ b/app-crypt/openpgp-keys-linuxcontainers/metadata.xml
@@ -5,4 +5,5 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-midipix/Manifest b/app-crypt/openpgp-keys-midipix/Manifest
index 3b11558061ea..6151dd0f70e0 100644
--- a/app-crypt/openpgp-keys-midipix/Manifest
+++ b/app-crypt/openpgp-keys-midipix/Manifest
@@ -1,3 +1,3 @@
 DIST openpgp-keys-midipix-20210426-6482133FE45A8A91EEB0733716997AE880F70A46.asc 5316 BLAKE2B f1ab82aad33fa2a2ccb8954a87caaf07d90533c087f80473bd83b739cab1d4573c0ddf88c04dab92e2f430c7bcc34ffe91adcd37ec29fccc5ee2d8ab44ca003b SHA512 4dc51f065f24851736d574497e19f05eabd21ba3b4d9449f0c723f4b956b5303813118e7ac1420278c60328ba98e95d0020cb95058a1e9f02aa845e0d80be9d3
 EBUILD openpgp-keys-midipix-20210426.ebuild 654 BLAKE2B 5d410c92277b5344f66c73a37f4a5892bf18260119c067ebdb3a42ed700d78db9994abe02e1b9e4ea913713eae8f402d6eade98ed1f2780c5abc178dce5bb2d0 SHA512 c8e83fc417c6aba9fe2ce5ef5bf593c039a3e1fe9164250b39dbab4373fd0cc142cf43c371c7115e0b52a342d88a91b077eea1b7bf1043680163589edc9d9d01
-MISC metadata.xml 239 BLAKE2B c3f80795644ca8d3012c8071f317e1e465b7d872e1ea1b588d39633f5a01afa8524326142708b549145b6ff5dfc2a3990cf7d05446adc81b0b757a20c73b7ec5 SHA512 d6ea54fb5d3105910888a617840c732bee452eeaa967da073389e417d2fbe0165b335ddbc261b2eb96ad5b6fabd05515f5d76962629716a5ea9a345793dad855
+MISC metadata.xml 263 BLAKE2B 3674e5c7d5dedc501574b523bf09a9f2d8f2e066edffa5649d59afba65ef3d9c36f3fd909f196f676b5b1266e5edce6ba6c44cf11fdca73b02b30cebcb662a3e SHA512 2f82b95119eb592f8edd7468010dbdc6863b235a0827586114fca02d01d45ce32a2be24077edfa497b0692f2f14447ad070c15b8a951b87091806750b8b0b862
diff --git a/app-crypt/openpgp-keys-midipix/metadata.xml b/app-crypt/openpgp-keys-midipix/metadata.xml
index 979bcc7aec93..a1af484833bd 100644
--- a/app-crypt/openpgp-keys-midipix/metadata.xml
+++ b/app-crypt/openpgp-keys-midipix/metadata.xml
@@ -5,4 +5,5 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-mlichvar/Manifest b/app-crypt/openpgp-keys-mlichvar/Manifest
index 292ec6bc0673..8aef7a56fcfa 100644
--- a/app-crypt/openpgp-keys-mlichvar/Manifest
+++ b/app-crypt/openpgp-keys-mlichvar/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..3a816580475f
--- /dev/null
+++ b/app-crypt/openpgp-keys-mlichvar/openpgp-keys-mlichvar-20210513.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="OpenPGP keys used by Miroslav Lichvar"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://chrony.tuxfamily.org/gpgkey-8F375C7E8D0EE125A3D3BD51537E2B76F7680DAC.asc -> ${P}.asc"
+S="${WORKDIR}"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+
+	insinto /usr/share/openpgp-keys
+	newins - mlichvar.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/app-crypt/openpgp-keys-openzfs/Manifest b/app-crypt/openpgp-keys-openzfs/Manifest
index c5332334f0ef..a9c8237af504 100644
--- a/app-crypt/openpgp-keys-openzfs/Manifest
+++ b/app-crypt/openpgp-keys-openzfs/Manifest
@@ -2,4 +2,4 @@ AUX 29D5610EAE2941E355A2FE8AB97467AAC77B9667-nedbass.asc 3094 BLAKE2B 0df61c1fa1
 AUX 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027-tonyhutter.asc 3114 BLAKE2B 9e16c93a08d1bff70a80dfcc59f337bfa15832fca276edb745534c31cd5100e066c9395e9ca17672ca038a848d6d1de652d7ce171dad41ad5827f191001dbda8 SHA512 7d2f6157631ac6da944626e58df4d7cbbb41495a6e800b1ec8cf9bf21a78fd7489f39304eb24f9aac3a6a2efee6d85fd1c8ce8e775309aacaa2e2160e2025c33
 AUX C33DF142657ED1F7C328A2960AB9E991C6AF658B-brianbehlendorf.asc 1851 BLAKE2B 6691a1ca548625217f33c15b98cff10965208ec3fb371dc9816c1a9aa3057c5c06390b731cdd60f9a69e32dceb199907d824b106147fe37e429d904052a577b2 SHA512 6aff82a8e2ccede77c30e91f63fac9fb01e3086eadfc6764fa30bb2faab3929baeec938024ee6388ccd3a1b10e50cbc153b91ff5487a596f36ee22a2f3ae530c
 EBUILD openpgp-keys-openzfs-20210419.ebuild 822 BLAKE2B 97cb87f071d589c2a9ed3e43f58403096b9df21ea317fad0bc391bc04a47dbc56010b9ea8de558a49fb0a8266b5e9447faa078e8eea424405d203a9dabd91282 SHA512 a324b80df4a1126f695b3294954bb16331cb6af0085cdae9704b5a477d24588f29cdbf3f621c30e5b26a43d1805752e8773aefecc857a76930fab53c1c03ae80
-MISC metadata.xml 351 BLAKE2B 6bb2300d28dc19e72e8190f111706a7d000b3ff1e05f26984a00586070259a67edb3d441d0da1d7d1b12e903e8a2b6566cc18b0c142faa7ab3e629f44a65d9f9 SHA512 cc5dc5e7de6b1422fe5d5b48b3c95a88da27d4242772556ea17c4c894aa2dcf2d173de3ebe29f489185c13a23ac179bf3269cf7fcdc6e5774b18f0e0af381067
+MISC metadata.xml 375 BLAKE2B c1718f20503fd56fa0fca50ce817d37512ca25aecd1e6187f15b42b96394a9e28653278301c4971e78a56e1e800b5b44b60a632bd655230ca860b56c2b8abe30 SHA512 5373a7e1aa73872044a6e4e55160a24552b28173e6a42a4c035326148c93f32db789362f49c03e11dafce3483c907a0f67ce0b61f9316cafe64ae1a441c32279
diff --git a/app-crypt/openpgp-keys-openzfs/metadata.xml b/app-crypt/openpgp-keys-openzfs/metadata.xml
index e44c7fdca139..1da2dbb3e5b1 100644
--- a/app-crypt/openpgp-keys-openzfs/metadata.xml
+++ b/app-crypt/openpgp-keys-openzfs/metadata.xml
@@ -9,4 +9,5 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-rust/Manifest b/app-crypt/openpgp-keys-rust/Manifest
index 5e0c6addbc86..820d100ff16f 100644
--- a/app-crypt/openpgp-keys-rust/Manifest
+++ b/app-crypt/openpgp-keys-rust/Manifest
@@ -1,3 +1,3 @@
 DIST rust-key.gpg.ascii 5326 BLAKE2B d64f3afe75786535c6218b378e11f6e9d2ab585dfb98d72e039ed529b27671ff4338d1aa4fb5920f96d6e3d5416b72e273a862c955cb4b30788e4cc60e6b937a SHA512 a8b557e3cc23824b2a21b75ebdfb2cc1bff94ca0359ec13da2ce99398977d913639ab7bcf67d7cfb511510ca76038f243ad2eacff8a2e49435246128b2ee5cb8
 EBUILD openpgp-keys-rust-20210504.ebuild 664 BLAKE2B b939b332a272b0f5bb175811c64292b9074c3e9b54c37d3828121667964f0a8adde112d1f1878b7490f345c8444d9dd28c17019e99e8ce1dc6f34d76e1299d66 SHA512 6bc38f4bc830ae54fcf753386b0ce8b23206f6606c7a9606493b095e2b1cfc291dac1f08672fc8046acc9d5c481e151bd05d4183b1cefafaaeb85fa9d8a6938c
-MISC metadata.xml 348 BLAKE2B f4c9f330087aaf4b9aa1934709c3ebd9bd8533236abb7cb29e8ca0054917ada4a721ca95a62220388691e2ca0ed8e65a8fcb019b09204c26fcc424e226b2dcd9 SHA512 10825e446d3fface41e02367dd77ee7adf09d2999ba202780a4e061f759b4c25bf86be6430446101f8f263f46dee76ef886379df799c4d73f24cdf9accc168f4
+MISC metadata.xml 372 BLAKE2B 1a4d8f3ea99291b3943792696faf15de647114bd6f951949f2575504d83f1e65364f407e2eeb45fbe08b52f243ee8f50475d00af2750ade9b7af41ecb3f3a0b4 SHA512 0f55ecf0dfdc931320005ee6d22a88487e7436fc1d157d16c4b903c600e00c5c1ae18a6b4cffc72f911e8dcb38c07e29485e13ab2355d7521a0220726215dd1c
diff --git a/app-crypt/openpgp-keys-rust/metadata.xml b/app-crypt/openpgp-keys-rust/metadata.xml
index 7dadd5ecbfd7..d654e7ab1f5f 100644
--- a/app-crypt/openpgp-keys-rust/metadata.xml
+++ b/app-crypt/openpgp-keys-rust/metadata.xml
@@ -9,4 +9,5 @@
 		<email>rust@gentoo.org</email>
 		<name>Rust</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-crypt/openpgp-keys-tor/Manifest b/app-crypt/openpgp-keys-tor/Manifest
index d3e3487d1bf2..f913fe6df841 100644
--- a/app-crypt/openpgp-keys-tor/Manifest
+++ b/app-crypt/openpgp-keys-tor/Manifest
@@ -1,4 +1,4 @@
 DIST 7A02B3521DC75C542BA015456AFEE6D49E92B601.asc 21639 BLAKE2B 6aa893ed68a06ec546bb6c09202f1fa72a1f9437f683fed9adbdd46d93439465d13e5f8b78b79de1e3b0de33333be8940b8e285b67e34efc4df39e9879c8900c SHA512 e8512c35861caea88148cc16bf8f0df95d9526b1025e263e17dca53f5a9957913f4b3248c00dd61d12b7f823ee9782accc3faf98ac8008473fa74ab7c01d91f2
 DIST EF6E286DDA85EA2A4BA7DE684E2C6E8793298290.asc 21351 BLAKE2B b2225df2f0c345d113d5c138b3e8d5d87ba6019616fd03e7609faeab0df497acfeb7de589ef8ef13d781d10ab9e0d335cb00646ca5c92e98419b610808c8721d SHA512 40bc1add049a3bb02bd1ee7644161f0b60fb2fbe5172998b9e0a14e6fd7ee116905ee4a64c9f23f8f9bdde7b96b7716d4afd9016ae6a28dd761325c556eb92e8
 EBUILD openpgp-keys-tor-20210425.ebuild 775 BLAKE2B 224965cc490abc16402c32706af2190f143c9e17dd7a3bfc077442eee4ca434d6dfbf74f5db7021b399d03bea36837c906425aeb84c5ad08f71689331f6baf77 SHA512 4897bfe62c4281befec63b401f6565627b1c45acd14bce7793e89e98f89b0ab58ebfac69e8ec5bc86edfd34ff45a0963a1796b41a8492260db07a377af7e2e6d
-MISC metadata.xml 244 BLAKE2B 5ab2e2ef86c8090629d44278f94ae999764b7b84fb4ac0029641b1637c19fa876089829f1a188bfed20e870bc83e1947cb60ab54a2bbb5e4fd56fba93ac240dd SHA512 e7e947b6f1530b7fb42042d3470ff3e5d28b384cb3f32bc1d2f976baa91957b3a12b4fd74d968b9f5b2b2a6baa34e2696617ebfd7e0516c9f889879e203f8551
+MISC metadata.xml 243 BLAKE2B 6c4d7d7a477619496f4d0ecacc7649588b007b3141144b7628d2d0e09af4672400a41d7cb0784232a4a7b5f5b82eb4288c0404392cb736a42ec1a6d828ffd959 SHA512 2076531217f0967a0dae8a313062fb3d04c9d55e62bc9e402a99d4a451d937ab2d75383a7e3c7eef99909b2c911959879084423e5d73e5cbd8e8a9168eb1b91b
diff --git a/app-crypt/openpgp-keys-tor/metadata.xml b/app-crypt/openpgp-keys-tor/metadata.xml
index 1597a03e6f39..ca111ad8248f 100644
--- a/app-crypt/openpgp-keys-tor/metadata.xml
+++ b/app-crypt/openpgp-keys-tor/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
+	<maintainer type="person">
 		<email>blueness@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
diff --git a/app-crypt/openpgp-keys-voikko/Manifest b/app-crypt/openpgp-keys-voikko/Manifest
index 8c0ea8fc6990..31b493ce2f0b 100644
--- a/app-crypt/openpgp-keys-voikko/Manifest
+++ b/app-crypt/openpgp-keys-voikko/Manifest
@@ -1,3 +1,3 @@
 DIST 4AE3942E.asc.html 5476 BLAKE2B 22b3acf6d4360b1686890596e7c8de2a3a38e739aa0ea4ae7fa7e09295127c7196f5af5750bd30d5260365206e08397e3bda970a4b7cdfb2d0827f80f2810758 SHA512 025bafbfe98e2437a3919f4651e7583a5fccd60ff110904189969ce5fe1770ed4222c60a530065b7720a0e233d1a138b55cd7df4c8f28337b9e953547434429c
 EBUILD openpgp-keys-voikko-20201013.ebuild 638 BLAKE2B f35cef73faa74a6682418c4acb85b91714e27e6ce2e4b2b8f4e4a7bbc593558b4f4bc9034b6d0aa7181634441f041faf0e30a640c1d22fed7a8250dee23190a3 SHA512 38c708895b43c69ebd9bb469f4e2813ff696a9a1f839dac419e2b4f05427cfdec8b9a9497be0bc90f4bb00ec99b3de7156101c31cae27083cca56948f019ff0c
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
+MISC metadata.xml 279 BLAKE2B 8a35347a0311617855cc5b982f14aee93fd54de69d01d51525a613c788a8d7c50310c62fe1d50e53db598d38a8791bd377fd77b8017d9f435534920673ec45d7 SHA512 03d0a7c99f21ce2ef849387c80f61aaa85dc5ed4128f61a11bc5ef74d5566c255b5306d7c860003177e29a00d95f81ed739c92baaeeaa76b6fa565b5bbc45a1f
diff --git a/app-crypt/openpgp-keys-voikko/metadata.xml b/app-crypt/openpgp-keys-voikko/metadata.xml
index 6b0a0fb3a729..0bd14750c669 100644
--- a/app-crypt/openpgp-keys-voikko/metadata.xml
+++ b/app-crypt/openpgp-keys-voikko/metadata.xml
@@ -5,4 +5,5 @@
     <email>juippis@gentoo.org</email>
     <name>Joonas Niilola</name>
   </maintainer>
+  <stabilize-allarches/>
 </pkgmetadata>
diff --git a/app-crypt/tpm2-pkcs11/Manifest b/app-crypt/tpm2-pkcs11/Manifest
index 468aaf28bf2d..d645fbe741e3 100644
--- a/app-crypt/tpm2-pkcs11/Manifest
+++ b/app-crypt/tpm2-pkcs11/Manifest
@@ -1,4 +1,4 @@
 AUX tpm2-pkcs11-1.3.2-Remove-WError.patch 356 BLAKE2B d3c124abbad2e3f8a818091293156840e22fca3aa59b59ff8af4f5e3ddd351e56e1619c647b89fd84df7e804bfccd608a1c9ea89d586ca84eb0326d3563ebf79 SHA512 4cd405ff046fd209bcc543c55514e5750007f76e2ed014bcf50975d62493feee0173c0649a06632d2aff2bcd39375be4ec5d341ba75558a257edf7a4ae03a63c
-DIST tpm2-pkcs11-1.5.0.tar.gz 1355121 BLAKE2B 9c00deb62bf30e22ef346bcdf951252913709f6c953f45e68df35cea434e55f79a960fea16aaa46794650c0cceaf979f4250af8cc835e48f34aca5b2306f2685 SHA512 999adf3ea031dfbb0eadefbd6b2c5457bff738bad231efa70218032f851fe5ba466e37bdf47b5bce380c378b97e88b2a76c9b59a264db5c5f380a9ba3cce58a0
-EBUILD tpm2-pkcs11-1.5.0.ebuild 1559 BLAKE2B 91679bcf8eec8fe09d12601bbfa0bf0ad120d6eb60b0025044d31f814506bfeda522948dd150fbe9331c382f6079e35776dc85717879c4f0abfc99e61c1ad3b0 SHA512 9eba3fe01a307f46680bbd7e9880c71a6368d56711c67fdd10bc9f5d67bf934400621946df67e9528a8d93fbd60a140e9af4f5da3743ba50663ae6b83edc0c87
+DIST tpm2-pkcs11-1.6.0.tar.gz 1370370 BLAKE2B 5dd8c587688a26958e8406366ce14cdadc9d2279f01276037df3895f49f835bd021b96da2c7399881e23527c79c45d25417b57acfb961f934f29d785dacf87f7 SHA512 db94b2194837564fa330ac7cc15a5185258d5d632f033a60fa82a2b3246e046dac29b6dfece19b4e075383e999ac157286c7f18f6c5ab6a98dd01c8e810065ea
+EBUILD tpm2-pkcs11-1.6.0.ebuild 1559 BLAKE2B 91679bcf8eec8fe09d12601bbfa0bf0ad120d6eb60b0025044d31f814506bfeda522948dd150fbe9331c382f6079e35776dc85717879c4f0abfc99e61c1ad3b0 SHA512 9eba3fe01a307f46680bbd7e9880c71a6368d56711c67fdd10bc9f5d67bf934400621946df67e9528a8d93fbd60a140e9af4f5da3743ba50663ae6b83edc0c87
 MISC metadata.xml 472 BLAKE2B 4af9c148a85d2d2c3daf24b964fd5dd82549eee8f3f46368b44def7a8e1c252f84d61f2c210dfae475a6e679ebb7e7a57fdc5b2f6d6ae14bb3273cca11177219 SHA512 dfefef79006af7d6ea0a45130fc7fa43673318cd2c0efea02cf796838c1a3f10046f9b415d0b4ea33e63a2a4dcc34324f1a3d4b7627b92a32ea371374a7e4653
diff --git a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild
index fc4bbfa9a2f1..fc4bbfa9a2f1 100644
--- a/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.5.0.ebuild
+++ b/app-crypt/tpm2-pkcs11/tpm2-pkcs11-1.6.0.ebuild
diff --git a/app-crypt/tpm2-tss/Manifest b/app-crypt/tpm2-tss/Manifest
index f9640ef50339..4b95ae830b46 100644
--- a/app-crypt/tpm2-tss/Manifest
+++ b/app-crypt/tpm2-tss/Manifest
@@ -6,6 +6,6 @@ DIST tpm2-tss-2.4.3.tar.gz 1439120 BLAKE2B 21acce29f96e8039124874c024b43eb8d2c4f
 DIST tpm2-tss-2.4.5.tar.gz 1439394 BLAKE2B 644d917f545e93dd81856611522329caf4ff038e4ddb04d761f03339cc7308095abc1c9b46a4d601cad67deea6f917ee5e4236c59f3d7042a7fdf2d33630dd3f SHA512 2c92af07ed1cc3665c19479c00ce5608883081f311192a264a4f7d9119c75ac582596c53b910534c4b66dbb60de2ffd3d6218169748332609c2e0fc89f519259
 DIST tpm2-tss-3.0.3.tar.gz 1489136 BLAKE2B 5bf24cf2c36e579388f62eea06ab3811eab1a89c0cd5d12f6f61cee7f6836487f25fefb864432ff8920931ff37327ca867d1d40fad89e0305d5e1edfb8f0e883 SHA512 54a926db55790250d69c81ac6e436556072057dd7c610d2718689030287dee69d533d4e04b3325dd73d9fc7635dad0bf0a7bfb082957bb51cb420efdb68efaf8
 EBUILD tpm2-tss-2.4.3.ebuild 1706 BLAKE2B 8093b404fa89ac49f22375f59b4f9e4f77e6f73fbb63841734f02413ce26d78c5f689630ee085419e3abb70e0b27d9bc341ca10ed329c5f0e676fdd65a760cbb SHA512 96e2af5daf4e0ad4ac2fa98afa35438383b56a61da704db591ffe502d35ae092c952674504d93758ddfdf7d39ee1bf91bd8a1b41f807188858a6314d6fc4a393
-EBUILD tpm2-tss-2.4.5.ebuild 1792 BLAKE2B 070f12c2add6ca65276a2954a2e14c2f0d399256988a07d30cd37bfd96ddd6a390fed1baf372b7377e746dd6ed0f4595c76e1b725a807924d76cdb6439d6fe11 SHA512 a6aae008df0ec09b4ce09b27f6e5c98bad4697f26613d7b479e73bfc6f7cbc1a02661c7f8fc4428ad0b058d3c5a92a7790887e5934c23b604f9ed8fb52cd31c2
+EBUILD tpm2-tss-2.4.5.ebuild 1791 BLAKE2B 407b4c3f446647f0376fad070976c6906580f26aecde8a6075525908186984a4f5e1f79b4ca76de7fdecb7f82a33b3367326fdaa94ce003c0eff01f11a800a2f SHA512 fc261a84aebc8ac8b73a16d744d16b226c0c90dc79fd5cac4ab2d161acfa7daba7e8eccf5ac34a1fff849934b12324ac6ec827be687ba9010bd01bb46c2456b5
 EBUILD tpm2-tss-3.0.3.ebuild 1780 BLAKE2B 89aad07e3a6bf66825d898bb98001a42f0cdcac534723e8ea6a2d5506eeabed823eb2958f4a1d50d35e10f4ff3699eb506ec5dee9da04415a04f92815d4f1807 SHA512 222bb72f83518a459fd777773034a101f352a8cfe67f9d6b06e2b5f8658b6b25cf6be522c07f0a6008a32bb9dad73b0e5f6fcd064f0fe7dada7f56dbd245b37b
 MISC metadata.xml 826 BLAKE2B fcae1100a2beb1c195736a96e394f8f0ca99cfff199e0777e307fe6443acb85105c3d982f9dd55d7945422f8b319ee93d9456d2f953d70d7604ab6f4461dbd55 SHA512 584edb582987e9ea4ff0dc19920bde4f0129c638cc580d188f57364f07b73ab0d0e64172c616a9d0fabbbcbf989cedf59f6ee29243df827c370217f9f60fab0e
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
index 3e7737e6da9d..2db31aefd06e 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc64 x86"
 IUSE="doc +fapi gcrypt +openssl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-crypt/yubikey-manager-qt/Manifest b/app-crypt/yubikey-manager-qt/Manifest
index 3106663b79ed..be12f10bf46d 100644
--- a/app-crypt/yubikey-manager-qt/Manifest
+++ b/app-crypt/yubikey-manager-qt/Manifest
@@ -1,3 +1,5 @@
 DIST yubikey-manager-qt-1.1.5.tar.gz 16066508 BLAKE2B cd15950c68cacc3e2904a5e1fbb3a2d98544084717f379202ccfe70082b0971959178730afb9ddbbfa20f436ef8d7cdf820df1e88539f99ce77913f60228af0f SHA512 b019a7cdebd741cd536a18670795f83c7e010e221b4f9c82dcd3c57b0c4bce878865c6605f10c962f4bd5e926c285a894ea97d2925ba091847ece5ffa7ce5bb6
+DIST yubikey-manager-qt-1.2.2.tar.gz 17311287 BLAKE2B 115dbf18ce0bfd48a1b172153d9770a3bde754b1dbef55ee1ec9480128305b9fb0d52af23906a6f6040df71cc4d3d4be216615fc3807395f7e7be1615a5568da SHA512 dbac2d51b198ab15051790e080ad92aaef4b0d44596ad136115469e7bf038d6b56d1bfa78a69d1fda3644543f9762051767b8a1fd46a80f2f62ecf836f7df3d8
 EBUILD yubikey-manager-qt-1.1.5.ebuild 1482 BLAKE2B ef6a4e9604b3b7d9f86e019b9a1cce9c93259fd4b4e2332dca7ebc64d6a4dc9c0228c31584fd4b0e5346bf21b02846f1156e31b3d2ff344e883997abbf314e08 SHA512 c6d558b98f125fbeeccf0ffd3553b7a36f90956558b9b14c5842519b97dc4f14083e84dc05222d602ea101106cad515228b8f3e82075d2a00740379d9b12a98c
+EBUILD yubikey-manager-qt-1.2.2.ebuild 1418 BLAKE2B 239b5e71f825e75280e157648b95350e433a56d69c58e50e0e5687ecd9a33b995ac9ad45e1f0aedc07c22b66d3f8ca4c553ed56826d92e278a4a6076f9b909d8 SHA512 a4371ee94e1b4cf5272c88a6dc0ffdad3ec347458501b15e32b93b95bd840af4c29004452cd039917e5698f947f92c0aeb9872c61caf66b88376bc4767da22aa
 MISC metadata.xml 371 BLAKE2B 1081e69aeb641c9d7de472bed98dfb336bc37e5374becbec4603316176419dcdb337f29b355b3395b778d250a99e32b181b84b42d4b7c10dedce7c47a6a187f6 SHA512 ed480648e967bfa3d95f71a5131963290e4265c487a345b69e34ad23c4ab18d82b08cd1e4a12f389533cc9690163fed90c05d471375fadd074c99a235105e837
diff --git a/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild
new file mode 100644
index 000000000000..2e4e7d2727c9
--- /dev/null
+++ b/app-crypt/yubikey-manager-qt/yubikey-manager-qt-1.2.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit qmake-utils python-single-r1 desktop
+
+DESCRIPTION="Cross-platform application for configuring any YubiKey over all USB transports"
+HOMEPAGE="https://developers.yubico.com/yubikey-manager-qt https://github.com/Yubico/yubikey-manager-qt"
+SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+DEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=app-crypt/yubikey-manager-4.0.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+	')
+	dev-python/pyotherside[${PYTHON_SINGLE_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgraphicaleffects:5
+	dev-qt/qtgui:5
+	dev-qt/qtquickcontrols:5[widgets]
+	dev-qt/qtquickcontrols2:5[widgets]
+	dev-qt/qtsingleapplication[qt5(+),X]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	default
+
+	sed -i -e "s/ykman-cli//" ${PN}.pro || die
+	sed -e "/CONFIG += c++11/a CONFIG += qtsingleapplication" \
+		-i ykman-gui/ykman-gui.pro || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	emake install INSTALL_ROOT="${D}"
+
+	domenu resources/ykman-gui.desktop
+	doicon -s 128 resources/icons/ykman.png
+	doicon -s scalable resources/icons/ykman.svg
+
+	einstalldocs
+}