gentoo resync : 18.08.2019

5 files changed, 16 insertions, 107 deletions

diff --git a/app-crypt/yubikey-manager/Manifest b/app-crypt/yubikey-manager/Manifest
index a50ed28d4b15..f56a256617f6 100644
--- a/app-crypt/yubikey-manager/Manifest
+++ b/app-crypt/yubikey-manager/Manifest
@@ -1,11 +1,7 @@
-AUX yubikey-manager-0.7.0-fix-tests.patch 599 BLAKE2B 1c1bf0c540a413a6aa380d89cff2e62675a1783971b44d09d1fd006aec248ebeb63dae0ec2ab1d7128f3ed4cd159e7efd80e274689bfc9592bee1288c2b6ea49 SHA512 5c97d10946f54d47373f8aa4d5ea0680eb00203c22427a63fd9ff4a401aa8316326148b72c10442672406dc2099a767aba41d83bef240d7f67561504acf55f10
-DIST yubikey-manager-0.7.1-test-files.tar.xz 9756 BLAKE2B 5a2e2a2a58d04c8f9954c1d13d0892b4f7392785d6e83e6948e720606318860b93e70862cee0ee7f987c14c3fa49bb7ff20cdf2a5bfc09c1f08681346428c003 SHA512 7543a9e9cfbe7f9ec02c98397f5cbd77cb307d79985a4b060176ee26605767e74d8b18d4c036ff90aed9a0232bb1382908c75e876a911c2ceb35a12666699b94
-DIST yubikey-manager-0.7.1.tar.gz 71834 BLAKE2B 45b0366531c8a158b3d8ebcfa8b76d608c14dba02224d4e4962c3757446829e3dff5f5e0d0ceda67caab7c67ad0510e037770c58a50552c2c6971136cb75c806 SHA512 3e9105f1c033f9314b90cf209eb52f7879fa1ea69e9ae6dac8de0b24d7d2ff6e45b6dd530917535fa645d6eea461f5b4f23bb8deb103ffc27d1f3483cfa681c7
-DIST yubikey-manager-1.0.0.tar.gz 90653 BLAKE2B 5d8522181ad460521995d3cae63976e06a444816a24efdc83b526d50262c902c8cc76b29d43f6f07725ee714666c853b690f1dd6fe98c9409f0cc1e722ada6f5 SHA512 9fd1926bf4e2c1278a42136a05db3e5fe0b7cb3d740f601fd0a420ab851badb61c2dd165157ac5b1f47e934f771b9d0b3cca4e07d1772d0f743556d482f77c11
 DIST yubikey-manager-2.0.0.tar.gz 102078 BLAKE2B a2b8f90dabefb1014881cbe709222bf5cb48c9f409b415a8a2b27d7101c2da6189d0ebfe21a2701d10798c48c44e546659f9424ba6bf9257f7311abb0fc90b9b SHA512 42bebb88ba78bcce00a228109d0b4c815b3242ddbe43fd26c1209ba8666eb033ab77d5acd39a157e8310ce327de8d38bf88cfa0ffaed6273236b220c39e72e3b
-DIST yubikey-manager-2.1.0.tar.gz 132797 BLAKE2B 39a170901dd10443f7cd639d1f525b12074ed042f606c083fe5b1bf04f463f608c4968c1e7f06dd057ff519a2a4bf712d36643e7db164ef92a3152ea5fb7ae15 SHA512 05cc1a106ffd2b40bc0a1286fa2f9c19f022bc7db04b85c9aaab3c67cad92a0c8ee4ba70f9b62ffa7f02ce67525a7d5f03bf9160b9bbe38909232cf75eb39373
-EBUILD yubikey-manager-0.7.1.ebuild 1574 BLAKE2B 3795fb4b15e9755e8c300631f8925302e6d2424e0fa41db5b0fac47dc5c6026ece423ce16d5ee4fed84be36f333ee0c6bf83116c2d304537ed8b0115c9842d77 SHA512 325b0e4278dcb1b9d12cf9d8b4a7b821a76e817706f1bbc96414edeaeca1d848022feef633881f145b276037302017f312f47fb82f499f403ba98f515656c3a3
-EBUILD yubikey-manager-1.0.0-r1.ebuild 1527 BLAKE2B a196e407ab7ecb5e8962b74d6f57c954afb4a8bc914097cff9377bd8eea682a415712718f2eb85e185631a2d04e3454869e4877effdecb5ead72f38401a00686 SHA512 462628ac751272d98b61da9c4aeef2f0c3ff0ef9fe094852dba92c3e6c364f42de68ea2789d31cf017c097198d0ce4b6132bc2d33de284fcae97828bfe020819
+DIST yubikey-manager-2.1.1.tar.gz 101672 BLAKE2B baafce3850c0cbed842508c93ec4ad71e0eebbd0dcc61833b245b6c62f74b7215519cb8b1ec82df3be8c7677ec24447193a0121e0a63e67615453c2c6032fc0a SHA512 2c5990d9421acf93113347e9b9d33af893765ae9c5d9e6c9c4f2db1274b84cd839c15ae74327bdcbe9ec32ebdbcbed95b172b8b13ac00bbeb17eb06b6dd71ccd
+DIST yubikey-manager-3.0.0.tar.gz 138225 BLAKE2B 8506f7cc4d6579c1905d565d5d32a7e745389000ff67786e5b5e6bc54793230321e5f0f4840c625cae0a4d9d2893b75910bebb3207cfc75189d3a4876838a712 SHA512 47ae785356c256f31e118f2df483d3a0d7fb7b5b380fd7cd207334daaa47319855bde41931099f9acb6b310d4ba824540ab5d3008384fd4d6a373da7355b18eb
 EBUILD yubikey-manager-2.0.0.ebuild 1678 BLAKE2B 519239065e438c2a3f0e97a716ee495cbf770d73b12dda8bfd90df1d943236e1c5b0a20c767ced6e5a0c7c771af829e1dc849a0b57bf86a74f79e1e6613ca89f SHA512 61582c69457763de6fe944e901cc9c9d97324b626f69dae985ac623c6d1e7ea7f7d9034f482748c4ad363745daa29d52d7639067ce4409ee8ff0c0a0a596e589
-EBUILD yubikey-manager-2.1.0.ebuild 1533 BLAKE2B 93c2a2dcb1e14699c11a36c771914b0915e4f41e887d2acbaa9c7372a762e0940528da47014a261e938acd2475f599c49841b0efd4e77b0327f6bd6cfb54b69e SHA512 d3233a47e12e149b97184538cb3797db980100378bf2eb2d23a852660c47f3757d6cc36deab88f82fad991df0b076d4e6f6c1800adf98810d8f8f7c90cbbb57f
+EBUILD yubikey-manager-2.1.1.ebuild 1533 BLAKE2B 93c2a2dcb1e14699c11a36c771914b0915e4f41e887d2acbaa9c7372a762e0940528da47014a261e938acd2475f599c49841b0efd4e77b0327f6bd6cfb54b69e SHA512 d3233a47e12e149b97184538cb3797db980100378bf2eb2d23a852660c47f3757d6cc36deab88f82fad991df0b076d4e6f6c1800adf98810d8f8f7c90cbbb57f
+EBUILD yubikey-manager-3.0.0.ebuild 1541 BLAKE2B a8bec0a494151e58e745a7668eaec3f12568789f5dda1c5c70508e289fc1d3549dd5b64fdd370c315f16e97ff235c9237c6bf1bda884cccc621e067940076a66 SHA512 7f12544ea492310409574aa7b4c4429d72c9e8eecec3291923813d515ac744488361d518c712536e12263150a771917e7ce7051e6ba4e29c686e2003f194aa46
 MISC metadata.xml 466 BLAKE2B 258688bf55e0d7d5d13a45996c2177d2154626a75ffd0c5b39cbc5c3f83979a00ec1d9a993870c00785d0e1d02cdeb1dadfa38f39d91b5992c5b495f644c6253 SHA512 6355c94235c5a7a9dbe37fb954d7de5807bbd48d62921f819da7ac1c56f0214820cbf74b2f91311573f8a1726b05960d944b536fbf0e0f27fe49a5aa0a827e1b
diff --git a/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch b/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch
deleted file mode 100644
index 46074d2241a5..000000000000
--- a/app-crypt/yubikey-manager/files/yubikey-manager-0.7.0-fix-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git b/test/util.py a/test/util.py
-new file mode 100644
-index 0000000..0551d06
---- /dev/null
-+++ a/test/util.py
-@@ -0,0 +1,18 @@
-+from click.testing import CliRunner
-+from ykman.cli.__main__ import cli
-+import os
-+
-+
-+PKG_DIR = os.path.dirname(os.path.abspath(__file__))
-+
-+
-+def open_file(*relative_path):
-+    return open(os.path.join(PKG_DIR, 'files', *relative_path), 'rb')
-+
-+
-+def ykman_cli(*argv, **kwargs):
-+    runner = CliRunner()
-+    result = runner.invoke(cli, list(argv), obj={}, **kwargs)
-+    if result.exit_code != 0:
-+        raise result.exception
-+    return result.output
diff --git a/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
deleted file mode 100644
index 92ae4418160e..000000000000
--- a/app-crypt/yubikey-manager/yubikey-manager-0.7.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-inherit readme.gentoo-r1 distutils-r1
-
-DESCRIPTION="Python library and command line tool for configuring a YubiKey"
-HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz
-	test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/${PN}/${PN}-0.7.1-test-files.tar.xz )"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-python/fido2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
-	sys-auth/ykpers
-"
-DEPEND="
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.0-fix-tests.patch
-)
-
-python_test() {
-	touch "${S}"/test/__init__.py || die
-	cp -r "${WORKDIR}/files" "${S}"/test/ || die
-	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
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild b/app-crypt/yubikey-manager/yubikey-manager-2.1.1.ebuild
index 1fe93622d5c9..1fe93622d5c9 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-2.1.0.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-2.1.1.ebuild
diff --git a/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild b/app-crypt/yubikey-manager/yubikey-manager-3.0.0.ebuild
index 13566d6483a4..cf74d5ba3a68 100644
--- a/app-crypt/yubikey-manager/yubikey-manager-1.0.0-r1.ebuild
+++ b/app-crypt/yubikey-manager/yubikey-manager-3.0.0.ebuild
@@ -8,26 +8,28 @@ inherit readme.gentoo-r1 distutils-r1
 
 DESCRIPTION="Python library and command line tool for configuring a YubiKey"
 HOMEPAGE="https://developers.yubico.com/yubikey-manager/"
-SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.gz
-	test? ( https://dev.gentoo.org/~gokturk/distfiles/app-crypt/${PN}/${PN}-0.7.1-test-files.tar.xz )"
+# 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"
+KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
-	dev-python/fido2[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/pyscard[${PYTHON_USEDEP}]
-	dev-python/pyusb[${PYTHON_USEDEP}]
 	dev-python/click[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7)
+	>=dev-python/fido2-0.7.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_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' 'python2_7')
@@ -35,8 +37,6 @@ DEPEND="
 "
 
 python_test() {
-	touch "${S}"/test/__init__.py || die
-	cp -r "${WORKDIR}/files" "${S}"/test/ || die
 	esetup.py test
 }
 
@@ -51,8 +51,9 @@ python_install_all() {
 		daemon is running and has correct access permissions to USB
 		devices.
 	"
-
 	readme.gentoo_create_doc
+
+	doman "${S}"/man/ykman.1
 }
 
 pkg_postinst() {