gentoo resync : 12.03.2021

14 files changed, 66 insertions, 19 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 783f62c79a83..43b62a342127 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index 6b38d91441e9..cf2f22de24f9 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -9,6 +9,6 @@ AUX nss-pam-ldapd-0.9.11-use-mkstemp.patch 789 BLAKE2B da9525e66873be615cfe90f6a
 AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 BLAKE2B 2e17a92b3650ce4e6627be7ddb2f656cd9ab53e49d7e2b11d078dac0d7a00015d88d861bfdc1378eb25c1b9750ed3811023cc95b04ccf9d028ffc5899dc01cd5 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962
 AUX pynslcd.init 515 BLAKE2B 711ba152ea9cc52198171e451889ab42a224581bae7e4378846f480063ed9a672fdb38b153d6941364d3d06e325d9feb95f6fd17885b4e6181d99393cb54de0a SHA512 56334d86cc027e538d8a0bf9a8b87308e3ae6e91be608a4a630f21c57cc41b6cb5dc6fb3220fed1ca555dd4da6a5c7c10b2776f9e49a7b71a96ece21fc65fed7
 DIST nss-pam-ldapd-0.9.11.tar.gz 777878 BLAKE2B c2b442786dd788dcf4373939ed52b4585d1821a7168fdd342ded3c99ef9ac8f3e4af0ac360f842b61885c1f2bc2ef85a0ce9ce0c1027bc974d0ba5242505657f SHA512 2b307805667526b85c724e113fe38899eee397e5c8673e89090d4836ce6d0ffcf18dd022d6c20a5e11d4138e736451b841a0f16ba379d524de4faaaf02906645
-EBUILD nss-pam-ldapd-0.9.11-r2.ebuild 4166 BLAKE2B 5a37ef7fcf75d7efeb949cc1c238881a62af101afc58acb8057f230d1c5e7ab662c9025d5e52f2bacc17a38320eab4102310ade703f0fd5afcc9dcb7ad22e5ab SHA512 e7982b8f6667d8dc19751feb406fe10a38c74b1ddf7902a0609eb3994237c76b843a5d7928b2969c346ba1b8f91b69a755b459b5e51897152785f25dc56fd9f1
-EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4329 BLAKE2B f39c5ea42a54fdcd43e4a90a34ecf5c9c6601397c36006c2badff0af650cad9d822bc16246ddb4a7602586baec3a06b2ec6683218fa0427b3a69ac6c3dd93f9c SHA512 88e9979d71b71acb5163be420a72701b5017ce0f95443b1aa2fba57803386bb0cb4c6b75145329b4c71bc5bb19a7b3de674232f0e3546608346e56970da32c70
+EBUILD nss-pam-ldapd-0.9.11-r2.ebuild 4166 BLAKE2B e59cd7f944bb20e41fdc51c8a6c873742c21e9df47f7c6f1e4170a720646318155576230b19ab54cc43ab4c4dd2c2efa1fa7d6d2ec50285e2e4dffc629f6ea6d SHA512 d89cd311f90603bedcb1726a570899a23746066f414019bb2cca8abf8e2543fee375505af42a9649baf0373c40f8bb38e4d1f6403048c248b9d6a85bea64899c
+EBUILD nss-pam-ldapd-0.9.11-r3.ebuild 4329 BLAKE2B 02e2a6dbbd6167cc29cc507fd1a117b9164442594a1944696db3fdb97143ab1b99a72ba42b777349c4c15518f87e721d4138119457254b38ea98f6638dac6948 SHA512 019a9497c49426782c971dd66fa3c064618c81fb5d6a2c010a3d6f755b8e4677bbe04622a939d79f3ad0635e56bfc4c5136a3ff2c3a6823950f3e9bcf9f0590b
 MISC metadata.xml 1169 BLAKE2B 22b5c9adcafb123a6af088ddfcaa1962eaf250ed153020e65afe36a0e6473b1f8c624f770634a91c3a983c74ded1d43535bb4930f13c6470fad681f5a77fcd51 SHA512 ab658f7d791db370920a4eb57da8ead2713b1cabda6f2dccd24478855043802e7c70a07c3aeaa33829b19dc94a4317d8b5ebec07d1caebe07b4fb3bc59b27b4c
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild
index b66a86d70305..f87a21058aaa 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=(python3_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6
+inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6 tmpfiles
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
@@ -116,7 +116,7 @@ multilib_src_install_all() {
 		newinitd "${FILESDIR}"/pynslcd.init pynslcd
 	fi
 
-	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
+	newtmpfiles "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
 	systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service
 }
 
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
index f5fdd529a7d9..f2b7b143da30 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.11-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=(python3_{7..8})
-inherit eutils prefix python-r1 autotools multilib multilib-minimal systemd s6
+inherit eutils prefix python-r1 autotools multilib multilib-minimal systemd s6 tmpfiles
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="https://arthurdejong.org/nss-pam-ldapd/"
@@ -131,7 +131,7 @@ multilib_src_install_all() {
 		newinitd "${FILESDIR}"/pynslcd.init pynslcd
 	fi
 
-	systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
+	newtmpfiles "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
 	systemd_newunit "${FILESDIR}"/nslcd.service nslcd.service
 }
 
diff --git a/sys-auth/pam_smb/Manifest b/sys-auth/pam_smb/Manifest
index 42cb3dbccc92..2f2274009809 100644
--- a/sys-auth/pam_smb/Manifest
+++ b/sys-auth/pam_smb/Manifest
@@ -1,5 +1,5 @@
 AUX 10-pam_smb-bash-3.1.patch 563 BLAKE2B 2173be16da19f07425fe08d1b4e80a2f6dca94d0625b72b19afc88db0a695851fb3b8224d6348eb49b89961cb7c35d626ecb89f92f4c0fa70d388633c6f46e00 SHA512 0616b5be037b1f7429285286c2d8ac2709aa788fb449bd3d28f0e8c5f2f17a0307a9621452525fa818d66e42ba57796efcdb2e83eefaaee2a2395ed8b57fb06a
 AUX pamsmbd-init 356 BLAKE2B 833510d8d8285cd066335314424b6c5de28ddaa58f71bccdb957782e99820fa19600e18cd58d0b71b2889ed27e9fe233c1c27914271dc9b5365dd8ee7db4e0dd SHA512 2bf495c9915e025a3c89a127131c2489cca9b76a1995fe3a6c9e473cac22a4b5dd22ef80c42d42c0ddf759ea63ac643096711cb1db9331b8033de7f26b4634f4
 DIST pam_smb-2.0.0-rc6.tar.gz 115069 BLAKE2B 095e2e7e356391ef5b6152ad6855df895afaae7ed78e5b287fa97879e5e2a531f6fbcf7e72bf030fa9b7d525636ffb21708d7e99f75d5206b6e6024a01c2f95e SHA512 c41519ae2b657dd7cbbbeb6d097ec82fd2d0d5c0f51f658eecea98e7aaf4eb87975fc1bc6592d19dbef0a650e428ec69829270a3c119fdab9443cddd6facbe6a
-EBUILD pam_smb-2.0.0_rc6-r2.ebuild 1093 BLAKE2B e94ebdf3be0289d1f6a764369c4dec6fc75929fa05186f47e9e5a6516833eff343fac0c603b97345b990e067ae440fc47531b4f2ed01d972e0b09420eee8d10a SHA512 cba34a335cb193eeb016f64b88e7e25e331acb4d32a6149ed89122b1a46f0ed52361494d2f78bb8cc81b8422361538bacb48ea742c796ac2bf93b3fae387083f
+EBUILD pam_smb-2.0.0_rc6-r2.ebuild 1100 BLAKE2B 129420b3ead9aeefb230fa15bcc63d0124fad5661cd22c3ce2b06e4e457e93a4e9082518dce315fb62836e1ddcd3e378785c78f337388ea41a1a7b2f57054df6 SHA512 b02b26f337115e52de556fea10db6797c83918f3f63312e237006b6375f3884354c0bc1998692f219074cc5bd6108245b6205a682a124e580e4783b03ba1c0e2
 MISC metadata.xml 239 BLAKE2B 3424eee302f16814cc391ac82a70ed8dcf57c19e443eb0bb4bb8ee9f4db236b7dc77b015e975c663cad4760157a9add0c84971ad7a0bfee13ca6a8d56ca87fc3 SHA512 2613369bbdfb5d60b16d10f4993395a634ce1175871fb084be372541de1d41cf03630379f2206f26f4cb7d80e183a7c8df740badb9ec10cc3a9dbd24bd198380
diff --git a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild
index d10331b793c5..dc4dd6bbca1c 100644
--- a/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.ebuild
+++ b/sys-auth/pam_smb/pam_smb-2.0.0_rc6-r2.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
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND=">=sys-libs/pam-0.75"
 RDEPEND="${DEPEND}"
diff --git a/sys-auth/pam_u2f/Manifest b/sys-auth/pam_u2f/Manifest
index 02b412cff06f..b2fae5b7f20a 100644
--- a/sys-auth/pam_u2f/Manifest
+++ b/sys-auth/pam_u2f/Manifest
@@ -1,6 +1,7 @@
 AUX pam_u2f-1.0.2-fix-Makefile.patch 324 BLAKE2B bc32459e011106e0f8516afe8e1afaa288e1bb53190b350467a12b9c6bbfaee9beb885bd78f1f1c3665b5f6907c1d7d99fb70d8d476b2dc3fe1fad2cba52f940 SHA512 eddf3c607e953b952ba91acb7d7bb1b8a43d6b70da86faece994011eb3eac43476c6ad9721be0a76805688dc9f9bab02ee5e13f58ce556bb68b8d574135ca44d
+AUX pam_u2f-1.1.0-include-limits_h.patch 929 BLAKE2B 8dae033c55d8299f72396cec45e3d1fdb121b5f36326ecdc55f7d84793c9409c3d96fa4beecfacbbac0fdd59f27893981fe99e9d46cab808a8f3e26056c037a6 SHA512 75d992031989a36ea558269f4d187a432adbb71d1a32d22b25e3020f1f6a0d56295b9344a1b6ba97f8dde6bf1918c7e3e530946b9fce9a98e315c798d4f07d87
 DIST pam_u2f-1.0.8.tar.gz 384163 BLAKE2B 99767601027db25e6f8d2e59aad5f72b078cf7344ca10fa310a990d512c5e5a4c9ff7c24acb5b21b88b82aa47b4052b9164a422426d1f0889c8f6776526e5c80 SHA512 0bdbea6307428bbed2af69129af207304f7951418ad7df339563f47d678a2cfe6b80321552382e15771cfc06306fae746521850056376f533c430556d051ad36
 DIST pam_u2f-1.1.0.tar.gz 415677 BLAKE2B dba5cd195d390ba4537752549fa5e0f4487930637fedd64b2750424d21d968bf8be54b75dccba92ac13a18b4e2d44825ec18089e9c4f5dc8e11ac12c36b8d28c SHA512 0ffcc32f0bbee279ad02f9c1cd928e2cf1df2fdebe718d869c16b7fece8edafd73cf08c5dfd6a2bc08434ed1970e16e4f89b6dae3b027a961ab43b26818b634f
 EBUILD pam_u2f-1.0.8.ebuild 721 BLAKE2B 1619ee4cc3cebf5dfc616df0503e17f98aaf86a3bcc03da8891d3b53f7dc1673d7dbec3f6e58bb0eb409397237a469c051f1d64aae26247e11152e7aee34d9f2 SHA512 d5a015b54ea6a697f0a676cd067d67e4ef7b0c738d974e679cb2289d153c03671d89c9ae5d2a22575bd3231278a1e349ca03024684614cf1e2cfa7ad9eaf8000
-EBUILD pam_u2f-1.1.0.ebuild 767 BLAKE2B 674ebe683368cbdcbdb703ec030b324bddf37f8c29650ea4210983e20fc4982464e0a0a3dd1f56eca61c53f53957fb887857070c155aa0f8ca7cff718a67d687 SHA512 f75d8b68e05efa792907390719a9c4d6fd8733fad2ecc8a37c5dce9fb989822bdd0f4ed88ab033892f08c77127b5b16b5870636795367718fe07199b5736359e
+EBUILD pam_u2f-1.1.0.ebuild 818 BLAKE2B a96f0819c2946fedce696fb57ed31c5a8f503df4270b9740f1a94ae71a75b746ba45a7bc4e2de87b1d002b796d03be77ba87722a6d070fa4a978d9fdd9c9023b SHA512 af0a1566dcf66687f55fb11f33600654b990cbe5a56f90ab521be35cab46815793cba5d604d926fa91195b3306edc2d04c2b3a238867e14305027ece2130b13e
 MISC metadata.xml 714 BLAKE2B 8694b13d8ec22eb56c2bf5637f0ef83c5adf369025aeec8f4512a79914cc00e43620d6db1d95361199c7861a41afd2f1c215758e84584af7d6fdeb7d00619101 SHA512 a59a8b6a51c50c63495eecf712d3a5c9f60b0a94d78a6d2a12d789eb334d77bc80b00de3c2368cbc3cc684c359085af71153f09d0ce5f9cf4f74be77fdc09277
diff --git a/sys-auth/pam_u2f/files/pam_u2f-1.1.0-include-limits_h.patch b/sys-auth/pam_u2f/files/pam_u2f-1.1.0-include-limits_h.patch
new file mode 100644
index 000000000000..edb959c7469d
--- /dev/null
+++ b/sys-auth/pam_u2f/files/pam_u2f-1.1.0-include-limits_h.patch
@@ -0,0 +1,41 @@
+From d46b5ed35017b089c30dd21305ac2147fcfc24f0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Fri, 16 Oct 2020 06:49:08 +0700
+Subject: [PATCH] b64,util: always include limits.h
+
+UCHAR_MAX and INT_MAX are defined within limits.h
+
+Current codebase failed to be built in Linux with musl libc due to
+missing this inclusion.
+
+Fix it.
+---
+ b64.c  | 1 +
+ util.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/b64.c b/b64.c
+index 0649c1e..7788089 100644
+--- a/b64.c
++++ b/b64.c
+@@ -4,6 +4,7 @@
+ 
+ #include <openssl/bio.h>
+ #include <openssl/evp.h>
++#include <limits.h>
+ #include <stdint.h>
+ #include <string.h>
+ 
+diff --git a/util.c b/util.c
+index fdae095..3ea1bd2 100644
+--- a/util.c
++++ b/util.c
+@@ -9,6 +9,7 @@
+ #include <openssl/ec.h>
+ #include <openssl/obj_mac.h>
+ 
++#include <limits.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
diff --git a/sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild b/sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild
index 6d719d8985b6..eeb67dd08529 100644
--- a/sys-auth/pam_u2f/pam_u2f-1.1.0.ebuild
+++ b/sys-auth/pam_u2f/pam_u2f-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
@@ -22,7 +22,10 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${PN}-1.0.2-fix-Makefile.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.2-fix-Makefile.patch"
+	"${FILESDIR}/${PN}-1.1.0-include-limits_h.patch"
+)
 
 src_prepare() {
 	default
diff --git a/sys-auth/solo-python/Manifest b/sys-auth/solo-python/Manifest
index 8384b8c9004a..b3e6e39d1371 100644
--- a/sys-auth/solo-python/Manifest
+++ b/sys-auth/solo-python/Manifest
@@ -1,5 +1,5 @@
 DIST solo-python-0.0.26.tar.gz 35251 BLAKE2B 76e515667220a8efdd16e159008eed8232721e0a8a1a1bffbc773cfa832b2f112d8dc229bf69dc4ccbee1d11b41d630a2d91e2383ebd19158d8c46ccf4f355de SHA512 f97da4a4ed3b0e0f4715407b179d8a8c1385076611fe8669cec6b514313d38dd14c6c22434b73e2c72f7456407a6c942b26b72cca7a56969cfbc630ee25aad85
 DIST solo-python-0.0.27.tar.gz 35657 BLAKE2B 747d8849ad4bdda7c0e4b079dce2d7162f07dad4784bb941242dd8ea759cccd763537cec2c7cd9ecf6f467c771729217648b72aa36292622f5fc3adb8a0c280c SHA512 50d564916e07a0c65a843bd2d0328a735ba71eadcfc893b13fac84a3e51822ed2bf80fc3f7662943a5635c6cd6b3ded8ba5b5a9ac2282c9f9bcdfe9de191e445
-EBUILD solo-python-0.0.26.ebuild 1133 BLAKE2B bfe44a9ace058b7cae1592afdb3724246529c4795d2f4e6b1adb0e8a479c6768203ca4537b2e4d8f28829ba1213ebb16c334b23875eed2b41da040077db771eb SHA512 a154b8616f47fb03c1b5432be0a3b31f491ffd9ff23967f0616717558d159f1176077d96e5e149300a7004572ee30406319c66af89fc1b6057ba6f960db1218e
-EBUILD solo-python-0.0.27.ebuild 1134 BLAKE2B 85b5a2b965d6f1a2833259dabb9ea3c3544fa51b4cae81cd1774ced9a6453e3af3a6dc6df5a72c0ca5dd511728a445794795f6cdd658315bdc20ea6969730086 SHA512 4064559b4ca71b9d3c3068125cab35cb1ac15f78be1ad32e29d291cb6c80a0446b13c1a7a2270613cbf5c9d53c39dfd21b10a96a02778038e43e175488b79997
+EBUILD solo-python-0.0.26.ebuild 1176 BLAKE2B 8ce0276e485d7428b4272e5d8e0de92a0db6846aafca666df74211595251d16fa1b1978c1d8e39af004455d120ec8354df007b900de84a9678a3befbdf0036cd SHA512 3cce3f79fb3fab66f28a4efcbe27466a23ef7081a235c4c85f97aa18809bdd494a221d4e6d0881c0f639cc2f1c52089167d78120604a196df67f7c392b750122
+EBUILD solo-python-0.0.27.ebuild 1176 BLAKE2B d1d247c95a6ae62b1f8f1964f303592a2ea7639c48aaa80d6e31d3bfbcb2d3b161ad7856cc93413601ed86d65a962dcdd0a03ddb374b745ef08b047c4f9ddef0 SHA512 f642a785bb585855c0cf93de1a96b5ff129784629215dbea706acc0c21aa98d55255bfd6fbe0126b4eaa64668e28aaec7f0da5478413743c66f56e055d31fbb6
 MISC metadata.xml 667 BLAKE2B 7ca73329d8c7713c4c96848d6c5fc23bec99cd45e42266236fe2c5e7d70023bd8d5647da307f0e362863b38393fb9d66c2bb8965763eac3bdf7d5f30a357c7a0 SHA512 ec1899ba5d2082758c79a2abda4e834fbe31358c900507d02801b2a04ea8d37ca2d420a974e16fc8813ffc4f92488f8db5a0d998600c6d28191942592004d031
diff --git a/sys-auth/solo-python/solo-python-0.0.26.ebuild b/sys-auth/solo-python/solo-python-0.0.26.ebuild
index e818982ae301..25ce53cdef78 100644
--- a/sys-auth/solo-python/solo-python-0.0.26.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.26.ebuild
@@ -21,6 +21,7 @@ RDEPEND=">=dev-python/click-7.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	>=dev-python/fido2-0.8.0[${PYTHON_USEDEP}]
+	<dev-python/fido2-0.9.0[${PYTHON_USEDEP}]
 	dev-python/intelhex[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
 	dev-python/pyusb[${PYTHON_USEDEP}]
diff --git a/sys-auth/solo-python/solo-python-0.0.27.ebuild b/sys-auth/solo-python/solo-python-0.0.27.ebuild
index 29ea8a9393ae..2ffa6ee8da58 100644
--- a/sys-auth/solo-python/solo-python-0.0.27.ebuild
+++ b/sys-auth/solo-python/solo-python-0.0.27.ebuild
@@ -15,12 +15,13 @@ SRC_URI="https://github.com/solokeys/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/click-7.0.0[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/ecdsa[${PYTHON_USEDEP}]
 	>=dev-python/fido2-0.8.1[${PYTHON_USEDEP}]
+	<dev-python/fido2-0.9.0[${PYTHON_USEDEP}]
 	dev-python/intelhex[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
 	dev-python/pyusb[${PYTHON_USEDEP}]
diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest
index 494a03f7978f..7d44b1f8d4c0 100644
--- a/sys-auth/yubico-piv-tool/Manifest
+++ b/sys-auth/yubico-piv-tool/Manifest
@@ -5,5 +5,5 @@ AUX yubico-piv-tool-2.1.1-ykcs11-threads.patch 1168 BLAKE2B ec91a73c7ad6c9ddd2e6
 DIST yubico-piv-tool-2.1.1.tar.gz 1302573 BLAKE2B da4419b7074930f7d264f21a12973511d350e687d0487b93d25a528f4a79d5df44dbbdde34ef7cd0d14507ba1a00f776fcd7eaf503f2253d8ee8da3e9a68010f SHA512 14d880088f7624f600c6badb6504c4c71ef29ff82e9c29bd837013e62273c6b198ca581705cc7fb9f3c0c13334767ea7b340fb033ce99fb60fb0478281affc9f
 DIST yubico-piv-tool-2.2.0.tar.gz 1309359 BLAKE2B a5be7a48549f864b9322b5bf53726007b593ce7d08cd06f2251aef98cb065d90586e0189e6f3da94d6d274d6998459afa4a55a0d4c1145395f55830f53d334e4 SHA512 b2f8cd73800e0e0778ce36148b962026479f5d3ada3e313acb5a780993c28c41b03e9aa9335ac5b79fed7a418a2d3d3697231adf2da0dd06cd8d22ea5a01aca5
 EBUILD yubico-piv-tool-2.1.1-r2.ebuild 1299 BLAKE2B 7de823f32fadb2fbd5a2e4d54045aad3e6cc57f5080859dad40b5097a137aeeae803ddd5066a7c74ff1537cb3a215f68c9559a63ef7488937d4436e8ac6b6017 SHA512 23e1c093dad527fc434678cb6cacfeb4bd1f0c94efd24e8e1a1ed45c19c1ed5d12a3d8847473f1109136377acef25898375a7df5615e4b6181c28c490892aec3
-EBUILD yubico-piv-tool-2.2.0.ebuild 1277 BLAKE2B 318c6dda1adb207d3e123fbd0f0b40e33495651b7759e314c6a78bd4ee925a81a3241cf278e3d58574c6ab4e3832b73ee802bbea320837fd13b9f3a3f541dd7d SHA512 f0b7289f7e3312c01881a0e6d0f4bfdca8fd21c0f50332ed004efe4b509b73ddf34633f7647a895b9b31ae60e33620533769a5667d1f037fa28cdc69d67e9a88
+EBUILD yubico-piv-tool-2.2.0.ebuild 1276 BLAKE2B 2933f90f0cc0e923a2b84e6cb2a778172baa8d274156cf983d8ae2800b56e10231d95b37e89f26b78afeeead38a6d711ecab1d873f1d23cd786d30a5d5a27a63 SHA512 d93172defe4acbd2119596bee1eaff1dff2adfe9a560c4415766299725c2971770cded9d9afd93c4f661e700def83b14c5d6a45035abedd5b42914567580b040
 MISC metadata.xml 332 BLAKE2B cab42a159a3cd0da5f66dbbd7e542f4fbae2deb966a20e7392baa575ce00b65b40db1846abb69baced17c6feb6f9e3d565620ed5476735cfaa121b0a2b81dc22 SHA512 892f4b9d170c5bd2679a1777215d7b88249bd4347c918499b762aa9ad0132b7b15d847180e4d27527d5cead6a4f8e23a7a4d3dc89752bda3852a99782129c257
diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild
index 986733af196b..92b44673f63d 100644
--- a/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild
+++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-2.2.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/2"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"