gentoo resync : 05.12.2021

4 files changed, 2 insertions, 117 deletions

diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index fa87c831d419..808781e3d47f 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,9 +1,5 @@
-DIST yubikey-manager-3.1.2.tar.gz 116728 BLAKE2B 35b592a26bbe1c2a1c81ddbc5fd5de2693b01dbadd04dd317baa14e5f9c5556ff8622bc36e31983947b4eed272be16d8ae1d55c6e30fe5532c20605c784411c5 SHA512 e7ad46536fae0476ae7ea4d7115ba9ddb0fe158fcd1e1d548524860b2033996f5487f9c948df85586d5b7ea690b51ad8d5b43261a56aa8820940226e0b18acaa
-DIST yubikey-manager-4.0.0.tar.gz 137438 BLAKE2B df50113ed46c531032785ceb95ee130a2440f88677b088f70095545528cbceff55db483bc299654beb8d78b3cea94a9c8507751a090a8488cc609680167ec8d7 SHA512 f1684122a9ee8d57fa3644ecf140e39973c822dfcb7cc1d6578a2ef9b09ff9b0078e6e4ab3f0eb6522a08703d095027f9f24bc8ca6fff8b6874f7a9b5e99f1b2
 DIST yubikey-manager-4.0.5.tar.gz 142197 BLAKE2B c48a9c6ae5f2d54b24888b750c6263eb501e68be56beb9fb964e8b9ea5131a608786b2e67d0d092ebcfacb15b09cae3eec19f4271893ac77eba70eee28b6d06d SHA512 f8bddf3121c0c509fcacb56500f1c1885354aff5c00b3347d9ca84cdf1df65276ed744209d9653474909b6cba7595bc5529cd4b37ec34c35d2d2c3cf2ff850de
 DIST yubikey-manager-4.0.7.tar.gz 143622 BLAKE2B 1ea768b4b95a65dc2cbc34f1e796a1012b534495154f475c7deb9ec7dbc807ff688d864abba8001752d3717034acbf39cd1cb17f147842fc38d27a83cb8c8ddc SHA512 7ba11488cddcc7d4bb15e673b7d8d82d8e85c52d8a4a3a13c6681cc494ecf33b88eb54556785783e6ec458292f155668bac0bb3a38a2df1702a24f623f8b084e
-EBUILD yubikey-manager-3.1.2.ebuild 1460 BLAKE2B 245167a792b93078529190fbfbd45bef1c80fc4d1fcf8ce0e6e72e9a2fef4c317708e5c1433dc6bf585e6821aa21511268e7e1191860b329961e1a8863c0a994 SHA512 19b3084bcf54261aaf1537ec8d13721aa5eb1701375c749428f1ff23cf6c586cd94faf9a45fdd6565c2fd8843af9858741c3a19ac3fb9abef67aca66ea178157
-EBUILD yubikey-manager-4.0.0.ebuild 1324 BLAKE2B f15e7265610bbff0ad64940db32e8455893c67382f81c1b5f1e918a279fb409cfbe9392314850383f5e353fbc29d7e6fe1514c0826775becb1e34749b3c25ca3 SHA512 b215021993fa42925c730c84a66e04b502cb2afd5a4c7a152f337e778c01dc2e1bb26f5071e4ff8ebf4c8acde5ac60ab4dba3b20136a9194b89d88f965ceab85
 EBUILD yubikey-manager-4.0.5-r1.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
-EBUILD yubikey-manager-4.0.7.ebuild 994 BLAKE2B 49a325598ffb2d676614db3c0d5058cb4800797ab2fd55a420687a4c6f92a15725133e1b33eea7d048e467b22469afcb6f3ac4374c75329541a32ddc03504089 SHA512 aadb4bbd45ea9318c756de8e473bd8edbd83705f6ab0d022ba954a7fd629e63e8df7006ff82a13b62b43da7094e12dbb3e00140e92452e7670035d20d02a92a7
+EBUILD yubikey-manager-4.0.7.ebuild 992 BLAKE2B 97f3f6c6c731a99c73c0a8c138cf3245a35003d4fab8bfa03908d91183ba8c60f62125e153cd71706c8746f089d77b29d99a1b685cb2db199ac66570d182ca80 SHA512 719cab973ed71b98c2ba156ee072d7c2a524fc259c3d80420925512cb19aebeec1df4306113f8dd8675ad46f4bd40c289a155822c88c38721417f8d954c4da51
 MISC metadata.xml 534 BLAKE2B 1dc91b31fae812c9abf38e762d18db228cf07cb29dc41f5c7928ef417002826acaaabaa3b1374433f9fdfc251b5f5fbabbc43e66e3b94cc6df3174d3ae5aa059 SHA512 cf47e3400679f7f4feb73ef3b8282d3f4dae6b6d0e5034cbc22935fd0196be0784946bf9ac93dea7fb36a16347f867d092845c1ce3528a00c704de9657ad3821
diff --git a/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild
deleted file mode 100644
index 8995c052f7c9..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-3.1.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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 readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/fido2-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/fido2-0.9.0[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=sys-auth/ykpers-1.19.0
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-	)
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-	readme.gentoo_create_doc
-
-	doman "${S}"/man/ykman.1
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild
deleted file mode 100644
index 46d392c70cf0..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-# Per https://github.com/Yubico/yubikey-manager/issues/217, Yubico is
-# the official source for tarballs, not Github
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="test" # Tests require non-existing package makefun
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/fido2:0/0.9[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	local DOC_CONTENTS
-
-	distutils-r1_python_install_all
-
-	DOC_CONTENTS="
-		The 'openpgp' command may require the package 'app-crypt/ccid'
-		to be installed on the system. Furthermore, make sure that pcscd
-		daemon is running and has correct access permissions to USB
-		devices.
-	"
-	readme.gentoo_create_doc
-
-	doman "${S}"/man/ykman.1
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
index 6409b45b5cd3..6ea12c8bda01 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-4.0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 RESTRICT="test" # Tests require non-existing package makefun
 
 # app-crypt/ccid required for