Sync with portage [Thu Jun 23 10:35:19 MSK 2022].

2 years ago · 23b257aa4a
parent 45212111b3
commit 23b257aa4a
8433 changed files with 22895 additions and 42769 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@ -1,4 +1,6 @@
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
 DIST ansible-core-2.12.5.tar.gz 7757691 BLAKE2B 04be15e932221dfbc8435c703efe3803d4de5f1f94b3205c220f4ea105ffd703df5dff680a4812f1230b77f21ee78b9f6b1020122442aac333aa26304d4d62c0 SHA512 795001257d8b2ffdca00c13a018ebfc822c11f1d8a0eb83df30a1670c19bdc995325da1c87414b672a4fcf8bf57215ff8b7a7b85325ad561d5123c549b18dbe9
 DIST ansible-core-2.12.6.tar.gz 7761844 BLAKE2B 37fe58bd04fcd59bb8085c31d8d7b4d4298c7911acb2a5988afa7a3b9d856769f0a737179f8d4828fd94a1a6c5e029385a7514a5f1b5155fffd6b8aa7ae7427f SHA512 55138701f3733b1ea2049783d9d0246beb7cc778090785eada756c9ef540b248bc345e07a261d5542648fc22088bc25e3ab57f7b904bba615264d5556baae456
+DIST ansible-core-2.12.7.tar.gz 7756456 BLAKE2B e9c5b446fbd80524572646667875afa26a28cd6f8a0c138383ef2af7fe2e51ba5dcbb19bdbb00e7e367ba78f9667be0b03320f887367dc5cc3d18cfc33ebf89b SHA512 15b29bc52cbcd690d442e4923bad23c2b4db34b1d9af9a7e3a73fbad6b4d775795a44df80c739ad409206767f6bc9efc3d5abdab593fb2abd6ba991ca8cbee67
 DIST ansible-core-2.13.0.tar.gz 7383065 BLAKE2B 14c9c30a1d04c4235877da9a2d866bae229fa0bb28815dccc2cbc37ca7a767a6a15b2ae1824849cb2c7031b3c3bdcac433b04bf353265228ab2beec7650aa7b9 SHA512 37e17d73477ba88c62af94a6912f9b4b91ebf2ac967c2845875e293fe2ed09307e414644899714e604883973e241eed571d61b7a093a6c212446a1f5b702af6f
+DIST ansible-core-2.13.1.tar.gz 7407801 BLAKE2B 230dd2f1030c6da89d5e2be6ea7d83b78c05b4216bad6d99b51807cdd3114d13cfbc8cc3b5c3583249937f774ce5b15ba1d524f8d68c201d3042ff1350981921 SHA512 f40ec5c8fdcc1e3f2ed78f398561aca5bfd4793a5f4d9240930f7aaf96233f05c7177304c30c06115943b5b9e9944286f01545cedd378e9c3e7f93c3ebce7c78
--- a/app-admin/ansible-base/ansible-base-2.12.7.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.7.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
--- a/app-admin/ansible-base/ansible-base-2.13.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.13.1.ebuild
@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+	EGIT_BRANCH="devel"
+else
+	MY_PN="${PN/-base/-core}"
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
+	<dev-python/resolvelib-0.9.0[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile() {
+	export ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@ -1,3 +1,5 @@
 DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
 DIST ansible-5.7.0.tar.gz 35864998 BLAKE2B 9bee56b3c1aec3af8fec68a80f97431d8c610a8646b755974cf6365d68e57a4adefb4f678ed76da1dd25802eec1abb45b596030b9ebca8337e4b9bf8c18b469b SHA512 2e2f88948e875a1ce5a6cac58ae0d918adf903848c60e125728314e935cbf29aae6db6ec87d9aad14fd5406751251a681b441f1209c789f14a1df6e68b91c3d9
 DIST ansible-5.7.1.tar.gz 35657258 BLAKE2B e13d294327ff6e6ca42a5fe95d5795c984319bace80da1d9e62b0eca861ac60cc9e6551c3bef6eddd8629670bb85b1f9ebc48fd093880248988831de2056908d SHA512 cba20da1a87e96600214b89539b5dd9ea0439edb6ccd757717c4041506b7ccb8ca046cd11840b2418bf0f6e725b21e56c8ac057f13604baba610d3716deee268
+DIST ansible-5.9.0.tar.gz 36756162 BLAKE2B 4c713f0a45536aadbd20451c5b5ac37b474cb1d1f9fbfa6031b228a549bfd65e1ae0ee76d6fcd08a0de43d7d07eaebf90d08d00764acad438bcffcdb09c5d58b SHA512 88b26b1ba59a39370ee4a27eedda441d6e6ce8ba8eb857353572c692e49b189e95ed80e5063917c52799fb15bc3608d4c1ada013a7d650909714ca8ea5dd3bbb
+DIST ansible-6.0.0.tar.gz 35015538 BLAKE2B 30736f5742c6b8a50f1cc763cec8ef7a7ca8d034a6365bb5aaedab7e768e35fa0ffdb999b53e59389da42e5ff305912e1716ce3b2847cfb44888fd22793d8abd SHA512 490bdc574ad6a444f8007138a12be5e5fcd8eb7abdd5466ff1924ac7c34e0a71be1c2495666ceefa1c88da48900fa2bca2c1e8d5775f3f559b1fa285bbcdcae9
--- a/app-admin/ansible/ansible-5.9.0.ebuild
+++ b/app-admin/ansible/ansible-5.9.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-base-2.12.0
+	<app-admin/ansible-base-2.13"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
--- a/app-admin/ansible/ansible-6.0.0.ebuild
+++ b/app-admin/ansible/ansible-6.0.0.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://www.ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+RESTRICT="test"
+
+RDEPEND=">=app-admin/ansible-base-2.13.0
+	<app-admin/ansible-base-2.14"
+
+python_compile() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_compile
+}
+python_install() {
+	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
+	distutils-r1_python_install
+}
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,3 +1,4 @@
 DIST aws-cli-1.25.12.gh.tar.gz 2224456 BLAKE2B d6425983b09fc3942727108e188e184f48399388704ada03df1d65ddb9adffc9597a217b863766a862e96b59c03fdb3202e694289b54ee9298fe7e547639ecc3 SHA512 a77e0d082a8dacecadbd2fa6cc1143fa5148e075894565fe9a552e9d1a27fd068c72ae57eb5c628129bb024267111b76722cf2c40dc9f719db8d96232302b918
 DIST aws-cli-1.25.13.gh.tar.gz 2224352 BLAKE2B 0f6b94545f8504dcf6a458df28b39b3a909869033ccf04ad1ad3652e6606573002cbd3fed7f65756a140bac7d3b1ccddbc6fcc84391b194b3a987cf8534c4bdc SHA512 f494f9b31e91bb0e7446867efe4539f04ac91b12ad7f4db2f355d1a391ce7a8bd1d40f4afe04855d227414a7c2479ec6fdaf9a42f1959b28d205df48c2b4d723
+DIST aws-cli-1.25.14.gh.tar.gz 2225058 BLAKE2B 185fb35a574a73d1d43adef515dbc1e67e81bf3ba5c6511365d6633c1b3c72263b4bdd1c0449a319292fdfa2f0eaef52fd8322785f26fa7ed5da0231d5aba6b2 SHA512 e7d854cff3c68a7ad41c3f481d64b12761dffb5186cc8919ec92bd48e9f9946773382eb276722ffc9776f34a972f50773e758aaa5212c168960fff07a71196b1
 DIST aws-cli-1.25.7.gh.tar.gz 2223153 BLAKE2B fcadda94fd721135f94b1538c4b27e41108064f6fd32f324d5436138e3d1b0ffcab53fcc545b01c461365d55c4bfa2a05d90e94c875c929a3227efae76452415 SHA512 194adacab0df87d8e4f0cdc71bb956bef6dc8b2de2e7e4416c9c079ff2b7c2bce7584ac1049428d0bcb134368b39c37c04bc5e6a8fc7540c44c64f3934ccaf21
--- a/app-admin/awscli/awscli-1.25.14.ebuild
+++ b/app-admin/awscli/awscli-1.25.14.ebuild
@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@ -1,6 +1,3 @@
-DIST salt-3000.2-py38-misc.patch.gz 6250 BLAKE2B 68fff80a042e6bf208ea2d9692da7a7b1e29572f1ec3c850c14743bbf2821d231f933ec4e6d6eaad12acee0b7666888a37a72872b2b082c92d8db9de988fbbec SHA512 6d4a66323a423e630f7cc73b566ed96c452c8fc3d72c25a2dd86033c4774c1c8e8b8701e1d4ee92994d4148c398d704f419023e26d8b40c8fdd63f9d79d9d52f
-DIST salt-3000.8.tar.gz 15249139 BLAKE2B df306669ba11dd650621222ff9c69f5a6e16b6f431e9d93e6712ee95da43091bfe28416fe0d71988ed9ee70cb347755b779a356c50fa59c63c67a874ed1906f4 SHA512 a18d5bea3b3835f83d5b1e5315990d83f6c58c36df5589d5de0f8cc3a46db4c960b58032e29d56841a160b9b170cdbb81bca38dbbd72ccb5866ccc8a7da6e800
-DIST salt-3000.9.tar.gz 15250432 BLAKE2B b76c166363b0b0fd3e3aa4b5306ba8280a2c99fbc7fd9866d957406bba8e6fcc03b769b53dbb80b115f9fa9f1fdc93e1eb257f4bf04283e414a309c16e4f078f SHA512 94214f20a8a080ebdcbb7e3351f60a466c3a92cc85d177c2ea677192a63e58b0f9cacfb1af04e14022a7ac570ebd0b931722d1d001a7655dcd7502813c29a092
 DIST salt-3001.8.tar.gz 15740488 BLAKE2B 77875a670b81438280becd1f29b64fbc766379192a9ca041568cd9360a3c4213bb3018063e88a297e9d1f637fb7ca3ef049a73a258022ec07e42f01a40bdf09a SHA512 8e90b2a1f82f951ab40a53a8af2ab421758ed8244f1881cc7aa71a8d9c2e2e6d892166ec8f8f6182966e56eb28c9aee6a060ee54b559b1d073fba97ad0afb013
 DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dce1995bd5c640cd9957bdfdba2e96deebaba927d6103fc50f4eaab86d51f4dd4594d25b7357db79ed67b39258e SHA512 c1e7bbcd39b5c2bef351bd74026346bf729839c4161f6eff8162620e9cb08a63073abeeb8af6bab635070386a883df494ef08cc07a84efa9aa7f2160b357a938
 DIST salt-3002.8.tar.gz 15798643 BLAKE2B 12280dfd29f46f9bb8b2df6fcef474c2c2237d6f9c71e1474caae58893605dd6f9fb4c4573f52765cb950cd15e31fc0fda2fa8dd1c87d48c1951d2812c1a3a81 SHA512 a88a6f77d2af2cff5d5244f38b16a1904da05bdfd45b2087691e41b07f21785b1838151314d7c80d3a33eebefe480c8f3678fa161e9ceaaa50c997022463c472
--- a/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch
+++ b/app-admin/salt/files/salt-2017.7.0-dont-realpath-tmpdir.patch
@ -1,19 +0,0 @@
-diff --git a/tests/support/paths.py b/tests/support/paths.py
-index da93c8e1e3..895c636fef 100644
--- a/tests/support/paths.py
-+++ b/tests/support/paths.py
-@@ -40,12 +40,12 @@ if CODE_DIR not in sys.path:
- if TESTS_DIR not in sys.path:
-     sys.path.insert(1, TESTS_DIR)
- 
-SYS_TMP_DIR = os.path.abspath(os.path.realpath(
-+SYS_TMP_DIR = os.path.abspath(
-     # Avoid ${TMPDIR} and gettempdir() on MacOS as they yield a base path too long
-     # for unix sockets: ``error: AF_UNIX path too long``
-     # Gentoo Portage prefers ebuild tests are rooted in ${TMPDIR}
-     os.environ.get('TMPDIR', tempfile.gettempdir()) if not sys.platform.startswith('darwin') else '/tmp'
-))
-+)
- TMP = os.path.join(SYS_TMP_DIR, 'salt-tests-tmpdir')
- FILES = os.path.join(INTEGRATION_TEST_DIR, 'files')
- PYEXEC = 'python{0}.{1}'.format(*sys.version_info)
--- a/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch
+++ b/app-admin/salt/files/salt-2019.2.8-ansible-roster-fix.patch
@ -1,13 +0,0 @@
-diff --git a/salt/roster/ansible.py b/salt/roster/ansible.py
-index f4a2a23e0b..e6b9e80247 100644
--- a/salt/roster/ansible.py
-+++ b/salt/roster/ansible.py
-@@ -129,7 +129,7 @@ def targets(tgt, tgt_type='glob', **kwargs):
- 
- def _get_hosts_from_group(group):
-     inventory = __context__['inventory']
-    hosts = [host for host in inventory[group].get('hosts', [])]
-+    hosts = [host for host in inventory.setdefault(group, {}).get('hosts', [])]
-     for child in inventory[group].get('children', []):
-         hosts.extend(_get_hosts_from_group(child))
-     return hosts
--- a/app-admin/salt/files/salt-3000.1-tests.patch
+++ b/app-admin/salt/files/salt-3000.1-tests.patch
@ -1,58 +0,0 @@
-diff --git a/tests/unit/fileserver/test_roots.py b/tests/unit/fileserver/test_roots.py
-index e0d939a086..33a9b6dc35 100644
--- a/tests/unit/fileserver/test_roots.py
-+++ b/tests/unit/fileserver/test_roots.py
-@@ -11,7 +11,7 @@ import tempfile
- 
- # Import Salt Testing libs
- from tests.support.mixins import AdaptedConfigurationTestCaseMixin, LoaderModuleMockMixin
-from tests.support.unit import TestCase
-+from tests.support.unit import TestCase, skipIf
- from tests.support.mock import patch
- from tests.support.runtests import RUNTIME_VARS
- 
-@@ -165,6 +165,7 @@ class RootsTest(TestCase, AdaptedConfigurationTestCaseMixin, LoaderModuleMockMix
-         self.assertIn('empty_dir', ret)
-         self.assertIn(UNICODE_DIRNAME, ret)
- 
-+    @skipIf(True, "doesn't like sandbox")
-     def test_symlink_list(self):
-         orig_file_roots = self.opts['file_roots']
-         try:
-diff --git a/tests/unit/modules/test_dockermod.py b/tests/unit/modules/test_dockermod.py
-index 191bfc123f..1956127f0b 100644
--- a/tests/unit/modules/test_dockermod.py
-+++ b/tests/unit/modules/test_dockermod.py
-@@ -793,6 +793,7 @@ class DockerTestCase(TestCase, LoaderModuleMockMixin):
-                 },
-                 ret)
- 
-+    @skipIf(True, "Doesn't work with sandbox")
-     def test_call_success(self):
-         '''
-         test module calling inside containers
-diff --git a/tests/unit/states/test_pip_state.py b/tests/unit/states/test_pip_state.py
-index 13c158b309..27e10e6161 100644
--- a/tests/unit/states/test_pip_state.py
-+++ b/tests/unit/states/test_pip_state.py
-@@ -384,6 +384,7 @@ class PipStateUtilsTest(TestCase):
- 
- 
- @skipIf(salt.utils.path.which_bin(KNOWN_BINARY_NAMES) is None, 'virtualenv not installed')
-+@skipIf(True, "Needs network access")
- class PipStateInstallationErrorTest(TestCase):
- 
-     def test_importable_installation_error(self):
-diff --git a/tests/unit/utils/test_jinja.py b/tests/unit/utils/test_jinja.py
-index f48fa9d42c..bb57929cfa 100644
--- a/tests/unit/utils/test_jinja.py
-+++ b/tests/unit/utils/test_jinja.py
-@@ -1268,7 +1268,7 @@ class TestCustomExtensions(TestCase):
-                                      dict(opts=self.local_opts, saltenv='test', salt=self.local_salt))
-         self.assertEqual(rendered, '16777216')
- 
-    @flaky
-+    @skipIf("True", "Needs network access")
-     def test_http_query(self):
-         '''
-         Test the `http_query` Jinja filter.
--- a/app-admin/salt/files/salt-3000.2-py38-abc.patch
+++ b/app-admin/salt/files/salt-3000.2-py38-abc.patch
@ -1,79 +0,0 @@
-From 11c23a526ae926ca082ee7ad92246e085c51b8e6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Blaisot?= <sebastien@blaisot.org>
-Date: Fri, 17 Jan 2020 17:06:42 +0100
-Subject: [PATCH] Import abstract base classes from collection.abc in python
- 3.3+
-
---
- salt/modules/file.py     | 6 +++++-
- salt/modules/win_file.py | 5 ++++-
- salt/states/file.py      | 6 +++++-
- salt/utils/dictdiffer.py | 5 ++++-
- 4 files changed, 18 insertions(+), 4 deletions(-)
-
-diff --git a/salt/modules/file.py b/salt/modules/file.py
-index 771b204d63fe..d1ec5e4c295d 100644
--- a/salt/modules/file.py
-+++ b/salt/modules/file.py
-@@ -29,7 +29,11 @@
- import glob
- import hashlib
- import mmap
-from collections import Iterable, Mapping, namedtuple
-+try:
-+    from collections.abc import Iterable, Mapping
-+except ImportError:
-+    from collections import Iterable, Mapping
-+from collections import namedtuple
- from functools import reduce  # pylint: disable=redefined-builtin
- 
- # pylint: disable=import-error,no-name-in-module,redefined-builtin
-diff --git a/salt/modules/win_file.py b/salt/modules/win_file.py
-index 4fd3eebcdd81..5bc983786a98 100644
--- a/salt/modules/win_file.py
-+++ b/salt/modules/win_file.py
-@@ -17,7 +17,10 @@
- import logging
- # pylint: disable=W0611
- import operator  # do not remove
-from collections import Iterable, Mapping  # do not remove
-+try:
-+    from collections.abc import Iterable, Mapping  # do not remove
-+except ImportError:
-+    from collections import Iterable, Mapping  # do not remove
- from functools import reduce  # do not remove
- import datetime  # do not remove.
- import tempfile  # do not remove. Used in salt.modules.file.__clean_tmp
-diff --git a/salt/states/file.py b/salt/states/file.py
-index 23c3d3c53955..36231c69cff6 100644
--- a/salt/states/file.py
-+++ b/salt/states/file.py
-@@ -291,7 +291,11 @@ def run():
- import sys
- import time
- import traceback
-from collections import Iterable, Mapping, defaultdict
-+try:
-+    from collections.abc import Iterable, Mapping
-+except ImportError:
-+    from collections import Iterable, Mapping
-+from collections import defaultdict
- from datetime import datetime, date   # python3 problem in the making?
- 
- # Import salt libs
-diff --git a/salt/utils/dictdiffer.py b/salt/utils/dictdiffer.py
-index 30e87e885436..da6bd5ed944c 100644
--- a/salt/utils/dictdiffer.py
-+++ b/salt/utils/dictdiffer.py
-@@ -13,7 +13,10 @@
- '''
- from __future__ import absolute_import, print_function, unicode_literals
- import copy
-from collections import Mapping
-+try:
-+    from collections.abc import Mapping
-+except ImportError:
-+    from collections import Mapping
- from salt.ext import six
- 
- 
--- a/app-admin/salt/files/salt-3000.2-py38-logwarn.patch
+++ b/app-admin/salt/files/salt-3000.2-py38-logwarn.patch
@ -1,116 +0,0 @@
-diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py
-index 68f752cb2d..fa2b96499d 100644
--- a/salt/cloud/clouds/ec2.py
-+++ b/salt/cloud/clouds/ec2.py
-@@ -4901,7 +4901,7 @@ def get_password_data(
- 
-     if not HAS_M2 and not HAS_PYCRYPTO:
-         if 'key' in kwargs or 'key_file' in kwargs:
-            log.warn("No crypto library is installed, can not decrypt password")
-+            log.warning("No crypto library is installed, can not decrypt password")
-         return ret
- 
-     if 'key' not in kwargs:
-diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py
-index 9dd1007c1b..47c82a7141 100644
--- a/salt/modules/gpg.py
-+++ b/salt/modules/gpg.py
-@@ -1083,7 +1083,7 @@ def verify(text=None,
- 
-     if trustmodel and trustmodel not in trustmodels:
-         msg = 'Invalid trustmodel defined: {}. Use one of: {}'.format(trustmodel, ', '.join(trustmodels))
-        log.warn(msg)
-+        log.warning(msg)
-         return {'res': False, 'message': msg}
- 
-     extra_args = []
-diff --git a/salt/modules/network.py b/salt/modules/network.py
-index 38e2bc326e..f3a8a714cd 100644
--- a/salt/modules/network.py
-+++ b/salt/modules/network.py
-@@ -958,7 +958,7 @@ def traceroute(host):
- 
-         ret.append(result)
-         if not result:
-            log.warn('Cannot parse traceroute output line: %s', line)
-+            log.warning('Cannot parse traceroute output line: %s', line)
-     return ret
- 
- 
-diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py
-index 138a0fcf51..5f026b0f36 100644
--- a/salt/modules/saltutil.py
-+++ b/salt/modules/saltutil.py
-@@ -1096,7 +1096,7 @@ def refresh_pillar(wait=False, timeout=30):
-             tag='/salt/minion/minion_pillar_refresh_complete',
-             wait=timeout)
-         if not event_ret or event_ret['complete'] is False:
-            log.warn("Pillar refresh did not complete within timeout %s", timeout)
-+            log.warning("Pillar refresh did not complete within timeout %s", timeout)
-     return ret
- 
- 
-diff --git a/salt/transport/tcp.py b/salt/transport/tcp.py
-index 12ef24e86f..e83d1c927f 100644
--- a/salt/transport/tcp.py
-+++ b/salt/transport/tcp.py
-@@ -1073,7 +1073,7 @@ class SaltMessageClient(object):
-                 self._connecting_future.set_result(True)
-                 break
-             except Exception as exc:  # pylint: disable=broad-except
-                log.warn('TCP Message Client encountered an exception %r', exc)
-+                log.warning('TCP Message Client encountered an exception %r', exc)
-                 yield salt.ext.tornado.gen.sleep(1)  # TODO: backoff
-                 #self._connecting_future.set_exception(e)
- 
-diff --git a/salt/utils/process.py b/salt/utils/process.py
-index 9626ac0cb2..18697ccf7c 100644
--- a/salt/utils/process.py
-+++ b/salt/utils/process.py
-@@ -124,7 +124,7 @@ def dup2(file1, file2):
-         try:
-             fno1 = file1.fileno()
-         except io.UnsupportedOperation:
-            log.warn('Unsupported operation on file: %r', file1)
-+            log.warning('Unsupported operation on file: %r', file1)
-             return
-     if isinstance(file2, int):
-         fno2 = file2
-@@ -132,7 +132,7 @@ def dup2(file1, file2):
-         try:
-             fno2 = file2.fileno()
-         except io.UnsupportedOperation:
-            log.warn('Unsupported operation on file: %r', file2)
-+            log.warning('Unsupported operation on file: %r', file2)
-             return
-     os.dup2(fno1, fno2)
- 
-@@ -829,13 +829,13 @@ class SignalHandlingProcess(Process):
-                             if child.is_running():
-                                 child.terminate()
-                         except psutil.NoSuchProcess:
-                            log.warn(
-+                            log.warning(
-                                 'Unable to kill child of process %d, it does '
-                                 'not exist. My pid is %d',
-                                 self.pid, os.getpid()
-                             )
-             except psutil.NoSuchProcess:
-                log.warn(
-+                log.warning(
-                     'Unable to kill children of process %d, it does not exist.'
-                     'My pid is %d',
-                     self.pid, os.getpid()
-diff --git a/tests/integration/modules/test_state.py b/tests/integration/modules/test_state.py
-index 81b3b677b9..2f3bcaa613 100644
--- a/tests/integration/modules/test_state.py
-+++ b/tests/integration/modules/test_state.py
-@@ -2282,7 +2282,7 @@ class StateModuleTest(ModuleCase, SaltReturnAssertsMixin):
-                 try:
-                     os.remove(path)
-                 except OSError:
-                    log.warn("Path not found: %s", path)
-+                    log.warning("Path not found: %s", path)
- 
-         with salt.utils.files.fopen(module_path, 'w') as fp:
-             fp.write('raise ImportError("No module named pip")')
--- a/app-admin/salt/files/salt-3000.2-py38.patch
+++ b/app-admin/salt/files/salt-3000.2-py38.patch
@ -1,60 +0,0 @@
-From 5259ba8ef6e5949815641edc563deab67ba68582 Mon Sep 17 00:00:00 2001
-From: Mathias Fussenegger <f.mathias@zignar.net>
-Date: Fri, 22 Nov 2019 17:05:27 +0100
-Subject: [PATCH] Remove _supported_dists import for python-3.8 support
-
-`_supported_dists` has been removed from platform in Python 3.8:
-
-    https://github.com/python/cpython/commit/8b94b41ab7b12f745dea744e8940631318816935#diff-47c8e5750258a08a6dd9de3e9c3774acL267-L271
-
-This instead inlines all the values that have been there.
-
-Without this change running `salt-ssh` with Python 3.8 run into an
-import error.
---
- salt/grains/core.py | 31 +++++++++++++++++++++++++++----
- 1 file changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/salt/grains/core.py b/salt/grains/core.py
-index 04c1ae91b5f5..77694abe84f9 100644
--- a/salt/grains/core.py
-+++ b/salt/grains/core.py
-@@ -35,11 +35,34 @@
- __proxyenabled__ = ['*']
- __FQDN__ = None
- 
-# Extend the default list of supported distros. This will be used for the
-+# Default list of supported distros. This will be used for the
- # /etc/DISTRO-release checking that is part of linux_distribution()
-from platform import _supported_dists
-_supported_dists += ('arch', 'mageia', 'meego', 'vmware', 'bluewhite64',
-                     'slamd64', 'ovs', 'system', 'mint', 'oracle', 'void')
-+_supported_dists = (
-+    'SuSE',
-+    'UnitedLinux',
-+    'arch',
-+    'bluewhite64',
-+    'centos',
-+    'debian',
-+    'fedora',
-+    'gentoo',
-+    'mageia',
-+    'mandrake',
-+    'mandriva',
-+    'meego',
-+    'mint',
-+    'oracle',
-+    'ovs',
-+    'redhat',
-+    'rocks',
-+    'slackware',
-+    'slamd64',
-+    'system',
-+    'turbolinux',
-+    'vmware',
-+    'void',
-+    'yellowdog',
-+)
- 
- # linux_distribution deprecated in py3.7
- try:
--- a/app-admin/salt/files/salt-3000.2-tests.patch
+++ b/app-admin/salt/files/salt-3000.2-tests.patch
@ -1,18 +0,0 @@
--- salt-3000.2.orig/tests/unit/utils/test_verify.py	2020-04-29 16:57:02.775635698 -0700
-+++ salt-3000.2/tests/unit/utils/test_verify.py	2020-04-29 16:57:58.042282147 -0700
-@@ -324,6 +324,7 @@
-         self.assertTrue(os.path.exists(path))
-
-
-+@skipIf(True, "breaks under sandbox")
- class TestCleanPath(TestCase):
-     '''
-     salt.utils.clean_path works as expected
-@@ -366,6 +367,7 @@
-         raise ctypes.WinError()
-
-
-+@skipIf(True, "breaks under sandbox")
- @skipIf(six.PY2 and salt.utils.platform.is_windows(), 'Skipped on windows py2')
- class TestCleanPathLink(TestCase):
-     '''
--- a/app-admin/salt/salt-3000.8-r1.ebuild
+++ b/app-admin/salt/salt-3000.8-r1.ebuild
@ -1,202 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
-	mongodb neutron	nova openssl portage profile redis selinux test raet
-	+zeromq vim-syntax"
-
-RDEPEND="
-	sys-apps/pciutils
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
-	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? (
-		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
-	)
-	openssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? (
-		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
-	)
-	neutron? (
-		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
-	)
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
-		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
-	test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-# tests failing with newer versions of deps
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-3000.1-tests.patch"
-	"${FILESDIR}/salt-3000.2-tests.patch"
-
-	# https://github.com/saltstack/salt/pull/55410
-	"${FILESDIR}/salt-3000.2-py38.patch"
-
-	# https://github.com/saltstack/salt/pull/55900
-	"${FILESDIR}/salt-3000.2-py38-abc.patch"
-
-	# misc py38 fixups
-	"${WORKDIR}/salt-3000.2-py38-misc.patch"
-	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
-	"${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch"
-)
-
-python_prepare_all() {
-	# remove tests with external dependencies that may not be available, and
-	# tests that don't work in sandbox
-	rm tests/unit/{test_zypp_plugins,utils/test_{extend,cache}}.py || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py || die
-
-	# tests that require network access
-	rm tests/unit/{states,modules}/test_zcbuildout.py || die
-	rm tests/unit/transport/test_zeromq.py || die
-
-	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
-	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	einfo "Fixing collections.abc warnings for ${EPYTHON}"
-	local abc
-	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
-	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
-
-		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}
-
-pkg_postinst() {
-	if use python_targets_python3_8; then
-		if use nova; then
-			ewarn "Salt's nova functionality will not work with python3.8 since"
-			ewarn "dev-python/python-novaclient does not support it yet"
-		fi
-		if use neutron; then
-			ewarn "Salt's neutron functionality will not work with python3.8 since"
-			ewarn "dev-python/python-neutronclient does not support it yet"
-		fi
-		if use libvirt; then
-			ewarn "Salt's libvirt functionality will not work with python3.8 since"
-			ewarn "dev-python/libvirt-python does not support it yet"
-		fi
-	fi
-}
--- a/app-admin/salt/salt-3000.9-r1.ebuild
+++ b/app-admin/salt/salt-3000.9-r1.ebuild
@ -1,203 +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} )
-
-inherit systemd distutils-r1
-
-DESCRIPTION="Salt is a remote execution and configuration manager"
-HOMEPAGE="https://www.saltstack.com/resources/community/
-	https://github.com/saltstack"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
-	EGIT_BRANCH="develop"
-	SRC_URI=""
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-		https://dev.gentoo.org/~chutzpah/dist/salt/salt-3000.2-py38-misc.patch.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako
-	mongodb neutron	nova openssl portage profile redis selinux test raet
-	+zeromq vim-syntax"
-
-RDEPEND="
-	sys-apps/pciutils
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/libnacl[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5[${PYTHON_USEDEP}]
-	<dev-python/msgpack-1.0[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/markupsafe[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	libcloud? ( >=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}] )
-	mako? ( dev-python/mako[${PYTHON_USEDEP}] )
-	ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-	libvirt? (
-		$(python_gen_cond_dep 'dev-python/libvirt-python[${PYTHON_USEDEP}]' python3_8)
-	)
-	openssl? (
-		dev-libs/openssl:0=[-bindist(-)]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-	)
-	raet? (
-		>=dev-python/libnacl-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/ioflo-1.1.7[${PYTHON_USEDEP}]
-		>=dev-python/raet-0.6.0[${PYTHON_USEDEP}]
-	)
-	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
-	cheetah? ( dev-python/cheetah3[${PYTHON_USEDEP}] )
-	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
-	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
-	selinux? ( sec-policy/selinux-salt )
-	nova? (
-		$(python_gen_cond_dep '>=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]' python3_8)
-	)
-	neutron? (
-		$(python_gen_cond_dep '>=dev-python/python-neutronclient-2.3.6[${PYTHON_USEDEP}]' python3_8)
-	)
-	gnupg? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	profile? ( dev-python/yappi[${PYTHON_USEDEP}] )
-	vim-syntax? ( app-vim/salt-vim )
-	zeromq? ( >=dev-python/pyzmq-2.2.0[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
-		>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
-		>=dev-python/libcloud-0.14.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/moto-0.3.6[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		dev-python/pytest-helpers-namespace[${PYTHON_USEDEP}]
-		>=dev-python/pytest-salt-2018.12.8[${PYTHON_USEDEP}]
-		dev-python/pytest-tempdir[${PYTHON_USEDEP}]
-		>=dev-python/SaltTesting-2016.5.11[${PYTHON_USEDEP}]
-		dev-python/virtualenv[${PYTHON_USEDEP}]
-		!x86? ( >=dev-python/boto3-1.2.1[${PYTHON_USEDEP}] )
-	)"
-
-DOCS=( README.rst AUTHORS )
-
-REQUIRED_USE="|| ( raet zeromq )
-	test? ( cheetah genshi )"
-RESTRICT="!test? ( test ) x86? ( test )"
-
-# tests failing with newer versions of deps
-#RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch"
-	"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch"
-	"${FILESDIR}/salt-3000.1-tests.patch"
-	"${FILESDIR}/salt-3000.2-tests.patch"
-	"${FILESDIR}/salt-3000.9-tests.patch"
-
-	# https://github.com/saltstack/salt/pull/55410
-	"${FILESDIR}/salt-3000.2-py38.patch"
-
-	# https://github.com/saltstack/salt/pull/55900
-	"${FILESDIR}/salt-3000.2-py38-abc.patch"
-
-	# misc py38 fixups
-	"${WORKDIR}/salt-3000.2-py38-misc.patch"
-	"${FILESDIR}/salt-3000.2-py38-logwarn.patch"
-	"${FILESDIR}/salt-2019.2.8-ansible-roster-fix.patch"
-)
-
-python_prepare_all() {
-	# remove tests with external dependencies that may not be available, and
-	# tests that don't work in sandbox
-	rm tests/unit/{test_zypp_plugins,utils/test_{extend,cache}}.py || die
-	rm tests/unit/modules/test_{file,boto_{vpc,secgroup,elb}}.py || die
-	rm tests/unit/states/test_boto_vpc.py tests/unit/test_module_names.py || die
-
-	# tests that require network access
-	rm tests/unit/{states,modules}/test_zcbuildout.py || die
-	rm tests/unit/transport/test_zeromq.py || die
-
-	# make sure pkg_resources doesn't bomb because pycrypto isn't installed
-	find . -name '*.txt' -print0 | xargs -0 sed -e '/pycrypto>/ d' -i || die
-	distutils-r1_python_prepare_all
-}
-
-python_prepare() {
-	einfo "Fixing collections.abc warnings for ${EPYTHON}"
-	local abc
-	abc="$("${EPYTHON}" -c 'import collections.abc; print("|".join((c for c in dir(collections.abc) if not c.startswith("_"))))')" || die
-	find -name '*.py' -type f -print0 | xargs -0 sed -r -e "s:collections\\.(${abc}):collections.abc.\\1:g" -i || die
-
-	# allow the use of the renamed msgpack
-	sed -i '/^msgpack/d' requirements/base.txt || die
-}
-
-python_install_all() {
-	local svc
-	USE_SETUPTOOLS=1 distutils-r1_python_install_all
-
-	for svc in minion master syndic api; do
-		newinitd "${FILESDIR}"/${svc}-initd-5 salt-${svc}
-		newconfd "${FILESDIR}"/${svc}-confd-1 salt-${svc}
-		systemd_dounit "${FILESDIR}"/salt-${svc}.service
-	done
-
-	insinto /etc/${PN}
-	doins -r conf/*
-}
-
-python_test() {
-	local tempdir
-	# testsuite likes lots of files
-	ulimit -n 3072 || die
-
-	# ${T} is too long a path for the tests to work
-	tempdir="$(mktemp -du --tmpdir=/tmp salt-XXX)"
-	mkdir "${T}/$(basename "${tempdir}")"
-
-	(
-		cleanup() { rm -f "${tempdir}" || die; }
-
-		trap cleanup EXIT
-
-		addwrite "${tempdir}"
-		ln -s "$(realpath --relative-to=/tmp "${T}/$(basename "${tempdir}")")" "${tempdir}" || die
-
-		USE_SETUPTOOLS=1 NO_INTERNET=1 SHELL="/bin/bash" \
-			TMPDIR="${tempdir}" \
-			${EPYTHON} tests/runtests.py \
-			--unit-tests --no-report --verbose \
-			|| die "testing failed with ${EPYTHON}"
-	)
-}
-
-pkg_postinst() {
-	if use python_targets_python3_8; then
-		if use nova; then
-			ewarn "Salt's nova functionality will not work with python3.8 since"
-			ewarn "dev-python/python-novaclient does not support it yet"
-		fi
-		if use neutron; then
-			ewarn "Salt's neutron functionality will not work with python3.8 since"
-			ewarn "dev-python/python-neutronclient does not support it yet"
-		fi
-		if use libvirt; then
-			ewarn "Salt's libvirt functionality will not work with python3.8 since"
-			ewarn "dev-python/libvirt-python does not support it yet"
-		fi
-	fi
-}
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -2,3 +2,5 @@ DIST sudo-1.9.10.tar.gz 4516568 BLAKE2B 94d97379e31b41917616a829cbece3d3fce7dd6a
 DIST sudo-1.9.10.tar.gz.sig 566 BLAKE2B 808919c826faa4f63efc283461f9f2089fd745aaf7462bcc41c505e7f978e7d56307202f96548d95844c99236fec10cada8438b935a1e1b6ea3601ee857d6900 SHA512 4ea0b736783b8e7be47645f770d7684d99c31f901177d3527f1ff78f5126d41592a94d36c67762bf5cb941eed80b9f585637aaa81d7f4920576d31a83f447323
 DIST sudo-1.9.11p2.tar.gz 4825417 BLAKE2B b6b16f17ba8b6d5ab80f5515beebddf21579944376c2b0752111120d9fb6e2c3d3c40c8150a4f1c2c7165fb93e1f9ac3d03f77b0951a6f721e026a175cc948c4 SHA512 ca64ace6b663a61336a2aa45fb96eb585b5075a867e770b0b384aaf015479dfae48847226c83f824372e64f4697454e68c36305f7979f14b662185c284e1da67
 DIST sudo-1.9.11p2.tar.gz.sig 566 BLAKE2B 9ffe8ebf79f3d94c2df4ce18bb811f73854920b262774ef114ed77ff78a2f856765651c0408cd0cd71191b21840fa3c6a73ca7897baa7975dd7b655eead45ab1 SHA512 a452fb875b3f4a05cc8623df18f7b53192b8671cdd8fcdbb9360cc86160b9aadb1148a60f91f106fd381997b91a4dfcf06149f3cb43292284d27997a4d97473f
+DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
+DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
--- a/app-admin/sudo/sudo-1.9.11_p3.ebuild
+++ b/app-admin/sudo/sudo-1.9.11_p3.ebuild
@ -0,0 +1,281 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit pam libtool tmpfiles toolchain-funcs
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/sudo.ws.asc
+	inherit verify-sig
+
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
+		verify-sig? (
+			https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
+			ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
+		)"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+
+	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	virtual/libcrypt:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1:=
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap:=[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? ( dev-libs/openssl:0= )
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND+="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	?? ( pam skey )
+	?? ( gcrypt ssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+set_secure_path() {
+	# First extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+
+	case "${SECURE_PATH}" in
+		*/usr/sbin*)
+			;;
+		*)
+			SECURE_PATH=$(unset PATH; . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+			;;
+	esac
+
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# Then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# Finally, strip gcc paths, bug #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do
+				[[ ${thisp} == ${e} ]] && continue 2 ;
+			done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+}
+
+src_configure() {
+	local SECURE_PATH
+
+	set_secure_path
+
+	# bug #767712
+	tc-export PKG_CONFIG
+
+	# - audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# - plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	local myeconfargs=(
+		# We set all of the relevant options by ourselves (patched
+		# into the toolchain) and setting these in the build system
+		# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
+		# (it'll downgrade to =2). So, this has no functional effect on
+		# the hardening for users. It's safe.
+		--disable-hardening
+
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP.md
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP.md for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins docs/schema.OpenLDAP sudo.schema
+	fi
+
+	if use pam ; then
+		pamd_mimic system-auth sudo auth account session
+		pamd_mimic system-auth sudo-i auth account session
+	fi
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	# bug #652958
+	fperms 0711 /var/db/sudo
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	# bug #697812
+	find "${ED}" -type f -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	# bug #652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the ${ROOT}/etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in ${ROOT}/etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your ${ROOT}/etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo on Prefix, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
--- a/app-admin/terraform/terraform-0.14.10.ebuild
+++ b/app-admin/terraform/terraform-0.14.10.ebuild
@ -1,961 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"cloud.google.com/go v0.26.0/go.mod"
-	"cloud.google.com/go v0.34.0/go.mod"
-	"cloud.google.com/go v0.38.0/go.mod"
-	"cloud.google.com/go v0.44.1/go.mod"
-	"cloud.google.com/go v0.44.2/go.mod"
-	"cloud.google.com/go v0.45.1/go.mod"
-	"cloud.google.com/go v0.46.3/go.mod"
-	"cloud.google.com/go v0.50.0/go.mod"
-	"cloud.google.com/go v0.52.0/go.mod"
-	"cloud.google.com/go v0.53.0/go.mod"
-	"cloud.google.com/go v0.54.0/go.mod"
-	"cloud.google.com/go v0.56.0/go.mod"
-	"cloud.google.com/go v0.57.0/go.mod"
-	"cloud.google.com/go v0.62.0/go.mod"
-	"cloud.google.com/go v0.65.0"
-	"cloud.google.com/go v0.65.0/go.mod"
-	"cloud.google.com/go/bigquery v1.0.1/go.mod"
-	"cloud.google.com/go/bigquery v1.3.0/go.mod"
-	"cloud.google.com/go/bigquery v1.4.0/go.mod"
-	"cloud.google.com/go/bigquery v1.5.0/go.mod"
-	"cloud.google.com/go/bigquery v1.7.0/go.mod"
-	"cloud.google.com/go/bigquery v1.8.0/go.mod"
-	"cloud.google.com/go/datastore v1.0.0/go.mod"
-	"cloud.google.com/go/datastore v1.1.0/go.mod"
-	"cloud.google.com/go/pubsub v1.0.1/go.mod"
-	"cloud.google.com/go/pubsub v1.1.0/go.mod"
-	"cloud.google.com/go/pubsub v1.2.0/go.mod"
-	"cloud.google.com/go/pubsub v1.3.1/go.mod"
-	"cloud.google.com/go/storage v1.0.0/go.mod"
-	"cloud.google.com/go/storage v1.5.0/go.mod"
-	"cloud.google.com/go/storage v1.6.0/go.mod"
-	"cloud.google.com/go/storage v1.8.0/go.mod"
-	"cloud.google.com/go/storage v1.10.0"
-	"cloud.google.com/go/storage v1.10.0/go.mod"
-	"dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible"
-	"github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest v11.1.2+incompatible/go.mod"
-	"github.com/Azure/go-autorest v14.2.0+incompatible"
-	"github.com/Azure/go-autorest v14.2.0+incompatible/go.mod"
-	"github.com/Azure/go-autorest/autorest v0.11.3"
-	"github.com/Azure/go-autorest/autorest v0.11.3/go.mod"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0"
-	"github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0"
-	"github.com/Azure/go-autorest/autorest/azure/cli v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0"
-	"github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0"
-	"github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0"
-	"github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0"
-	"github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod"
-	"github.com/Azure/go-autorest/logger v0.2.0"
-	"github.com/Azure/go-autorest/logger v0.2.0/go.mod"
-	"github.com/Azure/go-autorest/tracing v0.6.0"
-	"github.com/Azure/go-autorest/tracing v0.6.0/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c"
-	"github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod"
-	"github.com/BurntSushi/toml v0.3.1/go.mod"
-	"github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d"
-	"github.com/ChrisTrenkamp/goxpath v0.0.0-20190607011252-c5096ec8773d/go.mod"
-	"github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod"
-	"github.com/PuerkitoBio/purell v1.0.0/go.mod"
-	"github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod"
-	"github.com/QcloudApi/qcloud_sign_golang v0.0.0-20141224014652-e4130a326409/go.mod"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af"
-	"github.com/abdullin/seq v0.0.0-20160510034733-d5467c17e7af/go.mod"
-	"github.com/agext/levenshtein v1.2.1/go.mod"
-	"github.com/agext/levenshtein v1.2.2"
-	"github.com/agext/levenshtein v1.2.2/go.mod"
-	"github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod"
-	"github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a"
-	"github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190329064014-6e358769c32a/go.mod"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70"
-	"github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190103054945-8205d1f41e70/go.mod"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible"
-	"github.com/aliyun/aliyun-tablestore-go-sdk v4.1.2+incompatible/go.mod"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e"
-	"github.com/antchfx/xpath v0.0.0-20190129040759-c8489ed3251e/go.mod"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0"
-	"github.com/antchfx/xquery v0.0.0-20180515051857-ad5b8c7a47b0/go.mod"
-	"github.com/apparentlymart/go-cidr v1.1.0"
-	"github.com/apparentlymart/go-cidr v1.1.0/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0"
-	"github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod"
-	"github.com/apparentlymart/go-textseg v1.0.0"
-	"github.com/apparentlymart/go-textseg v1.0.0/go.mod"
-	"github.com/apparentlymart/go-textseg/v13 v13.0.0"
-	"github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13"
-	"github.com/apparentlymart/go-userdirs v0.0.0-20200915174352-b0c018a67c13/go.mod"
-	"github.com/apparentlymart/go-versions v1.0.1"
-	"github.com/apparentlymart/go-versions v1.0.1/go.mod"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2"
-	"github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da"
-	"github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod"
-	"github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod"
-	"github.com/armon/go-radix v1.0.0"
-	"github.com/armon/go-radix v1.0.0/go.mod"
-	"github.com/aws/aws-sdk-go v1.15.78/go.mod"
-	"github.com/aws/aws-sdk-go v1.31.9/go.mod"
-	"github.com/aws/aws-sdk-go v1.37.0"
-	"github.com/aws/aws-sdk-go v1.37.0/go.mod"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f"
-	"github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
-	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d"
-	"github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod"
-	"github.com/bgentry/speakeasy v0.1.0"
-	"github.com/bgentry/speakeasy v0.1.0/go.mod"
-	"github.com/bmatcuk/doublestar v1.1.5"
-	"github.com/bmatcuk/doublestar v1.1.5/go.mod"
-	"github.com/boltdb/bolt v1.3.1"
-	"github.com/boltdb/bolt v1.3.1/go.mod"
-	"github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod"
-	"github.com/cheggaaa/pb v1.0.27/go.mod"
-	"github.com/chzyer/logex v1.1.10"
-	"github.com/chzyer/logex v1.1.10/go.mod"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e"
-	"github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1"
-	"github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod"
-	"github.com/client9/misspell v0.3.4/go.mod"
-	"github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod"
-	"github.com/coreos/bbolt v1.3.0"
-	"github.com/coreos/bbolt v1.3.0/go.mod"
-	"github.com/coreos/etcd v3.3.10+incompatible"
-	"github.com/coreos/etcd v3.3.10+incompatible/go.mod"
-	"github.com/coreos/go-semver v0.2.0"
-	"github.com/coreos/go-semver v0.2.0/go.mod"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d"
-	"github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f"
-	"github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod"
-	"github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible"
-	"github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod"
-	"github.com/dimchansky/utfbom v1.1.0"
-	"github.com/dimchansky/utfbom v1.1.0/go.mod"
-	"github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod"
-	"github.com/dylanmei/iso8601 v0.1.0"
-	"github.com/dylanmei/iso8601 v0.1.0/go.mod"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1"
-	"github.com/dylanmei/winrmtest v0.0.0-20190225150635-99b7fe2fddf1/go.mod"
-	"github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod"
-	"github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.0/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod"
-	"github.com/envoyproxy/go-control-plane v0.9.4/go.mod"
-	"github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod"
-	"github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod"
-	"github.com/evanphx/json-patch v4.2.0+incompatible/go.mod"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fatih/color v1.7.0/go.mod"
-	"github.com/fsnotify/fsnotify v1.4.7/go.mod"
-	"github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod"
-	"github.com/ghodss/yaml v1.0.0"
-	"github.com/ghodss/yaml v1.0.0/go.mod"
-	"github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod"
-	"github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod"
-	"github.com/go-kit/kit v0.8.0/go.mod"
-	"github.com/go-logfmt/logfmt v0.3.0/go.mod"
-	"github.com/go-logr/logr v0.1.0/go.mod"
-	"github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod"
-	"github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod"
-	"github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod"
-	"github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod"
-	"github.com/go-sql-driver/mysql v1.5.0/go.mod"
-	"github.com/go-stack/stack v1.8.0/go.mod"
-	"github.com/go-test/deep v1.0.1/go.mod"
-	"github.com/go-test/deep v1.0.3"
-	"github.com/go-test/deep v1.0.3/go.mod"
-	"github.com/gofrs/uuid v3.2.0+incompatible/go.mod"
-	"github.com/gofrs/uuid v3.3.0+incompatible"
-	"github.com/gofrs/uuid v3.3.0+incompatible/go.mod"
-	"github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod"
-	"github.com/gogo/protobuf v1.1.1/go.mod"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d"
-	"github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b"
-	"github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod"
-	"github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod"
-	"github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod"
-	"github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod"
-	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e"
-	"github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod"
-	"github.com/golang/mock v1.1.1/go.mod"
-	"github.com/golang/mock v1.2.0/go.mod"
-	"github.com/golang/mock v1.3.1/go.mod"
-	"github.com/golang/mock v1.4.0/go.mod"
-	"github.com/golang/mock v1.4.1/go.mod"
-	"github.com/golang/mock v1.4.3/go.mod"
-	"github.com/golang/mock v1.4.4"
-	"github.com/golang/mock v1.4.4/go.mod"
-	"github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod"
-	"github.com/golang/protobuf v1.1.0/go.mod"
-	"github.com/golang/protobuf v1.2.0/go.mod"
-	"github.com/golang/protobuf v1.3.1/go.mod"
-	"github.com/golang/protobuf v1.3.2/go.mod"
-	"github.com/golang/protobuf v1.3.3/go.mod"
-	"github.com/golang/protobuf v1.3.4/go.mod"
-	"github.com/golang/protobuf v1.3.5/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.2/go.mod"
-	"github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod"
-	"github.com/golang/protobuf v1.4.0/go.mod"
-	"github.com/golang/protobuf v1.4.1/go.mod"
-	"github.com/golang/protobuf v1.4.2"
-	"github.com/golang/protobuf v1.4.2/go.mod"
-	"github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod"
-	"github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod"
-	"github.com/google/btree v1.0.0"
-	"github.com/google/btree v1.0.0/go.mod"
-	"github.com/google/go-cmp v0.2.0/go.mod"
-	"github.com/google/go-cmp v0.3.0/go.mod"
-	"github.com/google/go-cmp v0.3.1/go.mod"
-	"github.com/google/go-cmp v0.4.0/go.mod"
-	"github.com/google/go-cmp v0.4.1/go.mod"
-	"github.com/google/go-cmp v0.5.0/go.mod"
-	"github.com/google/go-cmp v0.5.1/go.mod"
-	"github.com/google/go-cmp v0.5.2"
-	"github.com/google/go-cmp v0.5.2/go.mod"
-	"github.com/google/go-querystring v1.0.0"
-	"github.com/google/go-querystring v1.0.0/go.mod"
-	"github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod"
-	"github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod"
-	"github.com/google/gofuzz v1.0.0"
-	"github.com/google/gofuzz v1.0.0/go.mod"
-	"github.com/google/martian v2.1.0+incompatible"
-	"github.com/google/martian v2.1.0+incompatible/go.mod"
-	"github.com/google/martian/v3 v3.0.0"
-	"github.com/google/martian/v3 v3.0.0/go.mod"
-	"github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod"
-	"github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod"
-	"github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod"
-	"github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod"
-	"github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod"
-	"github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod"
-	"github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod"
-	"github.com/google/renameio v0.1.0/go.mod"
-	"github.com/google/uuid v1.0.0/go.mod"
-	"github.com/google/uuid v1.1.1"
-	"github.com/google/uuid v1.1.1/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.4/go.mod"
-	"github.com/googleapis/gax-go/v2 v2.0.5"
-	"github.com/googleapis/gax-go/v2 v2.0.5/go.mod"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d"
-	"github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod"
-	"github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod"
-	"github.com/gophercloud/gophercloud v0.6.1-0.20191122030953-d8ac278c1c9d/go.mod"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5"
-	"github.com/gophercloud/gophercloud v0.10.1-0.20200424014253-c3bfe50899e5/go.mod"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d"
-	"github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d/go.mod"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
-	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
-	"github.com/gorilla/websocket v1.4.0"
-	"github.com/gorilla/websocket v1.4.0/go.mod"
-	"github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0"
-	"github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0"
-	"github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5"
-	"github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0"
-	"github.com/hashicorp/aws-sdk-go-base v0.6.0/go.mod"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089"
-	"github.com/hashicorp/consul v0.0.0-20171026175957-610f3c86a089/go.mod"
-	"github.com/hashicorp/errwrap v1.0.0"
-	"github.com/hashicorp/errwrap v1.0.0/go.mod"
-	"github.com/hashicorp/go-azure-helpers v0.12.0"
-	"github.com/hashicorp/go-azure-helpers v0.12.0/go.mod"
-	"github.com/hashicorp/go-checkpoint v0.5.0"
-	"github.com/hashicorp/go-checkpoint v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.0/go.mod"
-	"github.com/hashicorp/go-cleanhttp v0.5.1"
-	"github.com/hashicorp/go-cleanhttp v0.5.1/go.mod"
-	"github.com/hashicorp/go-getter v1.5.1"
-	"github.com/hashicorp/go-getter v1.5.1/go.mod"
-	"github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod"
-	"github.com/hashicorp/go-hclog v0.9.2"
-	"github.com/hashicorp/go-hclog v0.9.2/go.mod"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa"
-	"github.com/hashicorp/go-immutable-radix v0.0.0-20180129170900-7f3cd4390caa/go.mod"
-	"github.com/hashicorp/go-msgpack v0.5.4"
-	"github.com/hashicorp/go-msgpack v0.5.4/go.mod"
-	"github.com/hashicorp/go-multierror v1.0.0"
-	"github.com/hashicorp/go-multierror v1.0.0/go.mod"
-	"github.com/hashicorp/go-plugin v1.3.0"
-	"github.com/hashicorp/go-plugin v1.3.0/go.mod"
-	"github.com/hashicorp/go-retryablehttp v0.5.2"
-	"github.com/hashicorp/go-retryablehttp v0.5.2/go.mod"
-	"github.com/hashicorp/go-rootcerts v1.0.0"
-	"github.com/hashicorp/go-rootcerts v1.0.0/go.mod"
-	"github.com/hashicorp/go-safetemp v1.0.0"
-	"github.com/hashicorp/go-safetemp v1.0.0/go.mod"
-	"github.com/hashicorp/go-slug v0.4.1"
-	"github.com/hashicorp/go-slug v0.4.1/go.mod"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86"
-	"github.com/hashicorp/go-sockaddr v0.0.0-20180320115054-6d291a969b86/go.mod"
-	"github.com/hashicorp/go-tfe v0.8.1"
-	"github.com/hashicorp/go-tfe v0.8.1/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.0/go.mod"
-	"github.com/hashicorp/go-uuid v1.0.1"
-	"github.com/hashicorp/go-uuid v1.0.1/go.mod"
-	"github.com/hashicorp/go-version v1.0.0/go.mod"
-	"github.com/hashicorp/go-version v1.1.0/go.mod"
-	"github.com/hashicorp/go-version v1.2.0"
-	"github.com/hashicorp/go-version v1.2.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.0/go.mod"
-	"github.com/hashicorp/golang-lru v0.5.1"
-	"github.com/hashicorp/golang-lru v0.5.1/go.mod"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f"
-	"github.com/hashicorp/hcl v0.0.0-20170504190234-a4b07c25de5f/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.0.0/go.mod"
-	"github.com/hashicorp/hcl/v2 v2.9.1"
-	"github.com/hashicorp/hcl/v2 v2.9.1/go.mod"
-	"github.com/hashicorp/memberlist v0.1.0"
-	"github.com/hashicorp/memberlist v0.1.0/go.mod"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb"
-	"github.com/hashicorp/serf v0.0.0-20160124182025-e4ec8cc423bb/go.mod"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7"
-	"github.com/hashicorp/terraform-config-inspect v0.0.0-20191212124732-c6ae6269b9d7/go.mod"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734"
-	"github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d"
-	"github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod"
-	"github.com/hpcloud/tail v1.0.0/go.mod"
-	"github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod"
-	"github.com/imdario/mergo v0.3.5/go.mod"
-	"github.com/imdario/mergo v0.3.9"
-	"github.com/imdario/mergo v0.3.9/go.mod"
-	"github.com/jhump/protoreflect v1.6.0"
-	"github.com/jhump/protoreflect v1.6.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod"
-	"github.com/jmespath/go-jmespath v0.3.0/go.mod"
-	"github.com/jmespath/go-jmespath v0.4.0"
-	"github.com/jmespath/go-jmespath v0.4.0/go.mod"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1"
-	"github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod"
-	"github.com/jonboulle/clockwork v0.1.0"
-	"github.com/jonboulle/clockwork v0.1.0/go.mod"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926"
-	"github.com/joyent/triton-go v0.0.0-20180313100802-d8f9c0314926/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod"
-	"github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod"
-	"github.com/json-iterator/go v1.1.7"
-	"github.com/json-iterator/go v1.1.7/go.mod"
-	"github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod"
-	"github.com/jstemmer/go-junit-report v0.9.1"
-	"github.com/jstemmer/go-junit-report v0.9.1/go.mod"
-	"github.com/jtolds/gls v4.2.1+incompatible"
-	"github.com/jtolds/gls v4.2.1+incompatible/go.mod"
-	"github.com/julienschmidt/httprouter v1.2.0/go.mod"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0"
-	"github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod"
-	"github.com/kisielk/errcheck v1.2.0/go.mod"
-	"github.com/kisielk/gotool v1.0.0/go.mod"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1"
-	"github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod"
-	"github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod"
-	"github.com/kr/pretty v0.1.0"
-	"github.com/kr/pretty v0.1.0/go.mod"
-	"github.com/kr/pty v1.1.1/go.mod"
-	"github.com/kr/text v0.1.0"
-	"github.com/kr/text v0.1.0/go.mod"
-	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
-	"github.com/kylelemons/godebug v1.1.0"
-	"github.com/kylelemons/godebug v1.1.0/go.mod"
-	"github.com/lib/pq v1.8.0"
-	"github.com/lib/pq v1.8.0/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190309162924-0a377eecf7aa/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190418170008-ace88ad0983b/go.mod"
-	"github.com/likexian/gokit v0.0.0-20190501133040-e77ea8b19cdc/go.mod"
-	"github.com/likexian/gokit v0.20.15"
-	"github.com/likexian/gokit v0.20.15/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190409170913-40473a74d76d/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190419151922-c1f9f0b4f084/go.mod"
-	"github.com/likexian/simplejson-go v0.0.0-20190502021454-d8787b4bfa0b/go.mod"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82"
-	"github.com/lusis/go-artifactory v0.0.0-20160115162124-7e4ce345df82/go.mod"
-	"github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786"
-	"github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88"
-	"github.com/masterzen/winrm v0.0.0-20200615185753-c42b5136ff88/go.mod"
-	"github.com/mattn/go-colorable v0.0.9/go.mod"
-	"github.com/mattn/go-colorable v0.1.1"
-	"github.com/mattn/go-colorable v0.1.1/go.mod"
-	"github.com/mattn/go-isatty v0.0.3/go.mod"
-	"github.com/mattn/go-isatty v0.0.4/go.mod"
-	"github.com/mattn/go-isatty v0.0.5"
-	"github.com/mattn/go-isatty v0.0.5/go.mod"
-	"github.com/mattn/go-runewidth v0.0.4/go.mod"
-	"github.com/mattn/go-shellwords v1.0.4"
-	"github.com/mattn/go-shellwords v1.0.4/go.mod"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
-	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
-	"github.com/miekg/dns v1.0.8"
-	"github.com/miekg/dns v1.0.8/go.mod"
-	"github.com/mitchellh/cli v1.1.0"
-	"github.com/mitchellh/cli v1.1.0/go.mod"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db"
-	"github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod"
-	"github.com/mitchellh/copystructure v1.0.0"
-	"github.com/mitchellh/copystructure v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.0.0/go.mod"
-	"github.com/mitchellh/go-homedir v1.1.0"
-	"github.com/mitchellh/go-homedir v1.1.0/go.mod"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb"
-	"github.com/mitchellh/go-linereader v0.0.0-20190213213312-1b945b3263eb/go.mod"
-	"github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod"
-	"github.com/mitchellh/go-testing-interface v1.0.0"
-	"github.com/mitchellh/go-testing-interface v1.0.0/go.mod"
-	"github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod"
-	"github.com/mitchellh/go-wordwrap v1.0.0"
-	"github.com/mitchellh/go-wordwrap v1.0.0/go.mod"
-	"github.com/mitchellh/gox v1.0.1"
-	"github.com/mitchellh/gox v1.0.1/go.mod"
-	"github.com/mitchellh/iochan v1.0.0"
-	"github.com/mitchellh/iochan v1.0.0/go.mod"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/mitchellh/mapstructure v1.1.2/go.mod"
-	"github.com/mitchellh/panicwrap v1.0.0"
-	"github.com/mitchellh/panicwrap v1.0.0/go.mod"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51"
-	"github.com/mitchellh/prefixedio v0.0.0-20190213213902-5733675afd51/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.0/go.mod"
-	"github.com/mitchellh/reflectwalk v1.0.1"
-	"github.com/mitchellh/reflectwalk v1.0.1/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd"
-	"github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180320133207-05fbef0ca5da/go.mod"
-	"github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod"
-	"github.com/modern-go/reflect2 v1.0.1"
-	"github.com/modern-go/reflect2 v1.0.1/go.mod"
-	"github.com/mozillazg/go-httpheader v0.2.1"
-	"github.com/mozillazg/go-httpheader v0.2.1/go.mod"
-	"github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod"
-	"github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod"
-	"github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d"
-	"github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod"
-	"github.com/oklog/run v1.0.0"
-	"github.com/oklog/run v1.0.0/go.mod"
-	"github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod"
-	"github.com/onsi/ginkgo v1.6.0/go.mod"
-	"github.com/onsi/ginkgo v1.8.0/go.mod"
-	"github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod"
-	"github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod"
-	"github.com/onsi/gomega v1.5.0/go.mod"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db"
-	"github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c"
-	"github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod"
-	"github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4"
-	"github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod"
-	"github.com/pkg/errors v0.8.0/go.mod"
-	"github.com/pkg/errors v0.9.1"
-	"github.com/pkg/errors v0.9.1/go.mod"
-	"github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/posener/complete v1.1.1/go.mod"
-	"github.com/posener/complete v1.2.1"
-	"github.com/posener/complete v1.2.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.1/go.mod"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829"
-	"github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4"
-	"github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod"
-	"github.com/prometheus/common v0.2.0"
-	"github.com/prometheus/common v0.2.0/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1"
-	"github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod"
-	"github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod"
-	"github.com/rogpeppe/go-internal v1.3.0/go.mod"
-	"github.com/satori/go.uuid v1.2.0"
-	"github.com/satori/go.uuid v1.2.0/go.mod"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529"
-	"github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod"
-	"github.com/sergi/go-diff v1.0.0"
-	"github.com/sergi/go-diff v1.0.0/go.mod"
-	"github.com/sirupsen/logrus v1.2.0"
-	"github.com/sirupsen/logrus v1.2.0/go.mod"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
-	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a"
-	"github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod"
-	"github.com/soheilhy/cmux v0.1.4"
-	"github.com/soheilhy/cmux v0.1.4/go.mod"
-	"github.com/spf13/afero v1.2.2"
-	"github.com/spf13/afero v1.2.2/go.mod"
-	"github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod"
-	"github.com/spf13/pflag v1.0.1/go.mod"
-	"github.com/spf13/pflag v1.0.2/go.mod"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/pflag v1.0.3/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/objx v0.1.1/go.mod"
-	"github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod"
-	"github.com/stretchr/testify v1.2.2/go.mod"
-	"github.com/stretchr/testify v1.3.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.5.1"
-	"github.com/stretchr/testify v1.5.1/go.mod"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d"
-	"github.com/svanharmelen/jsonapi v0.0.0-20180618144545-0c0828c3f16d/go.mod"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible"
-	"github.com/tencentcloud/tencentcloud-sdk-go v3.0.82+incompatible/go.mod"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c"
-	"github.com/tencentyun/cos-go-sdk-v5 v0.0.0-20190808065407-f07404cefc8c/go.mod"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6"
-	"github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6/go.mod"
-	"github.com/tombuildsstuff/giovanni v0.12.0"
-	"github.com/tombuildsstuff/giovanni v0.12.0/go.mod"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5"
-	"github.com/ugorji/go v0.0.0-20180813092308-00b869d2f4a5/go.mod"
-	"github.com/ulikunitz/xz v0.5.8"
-	"github.com/ulikunitz/xz v0.5.8/go.mod"
-	"github.com/vmihailenco/msgpack v3.3.3+incompatible"
-	"github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod"
-	"github.com/vmihailenco/msgpack/v4 v4.3.12"
-	"github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod"
-	"github.com/vmihailenco/tagparser v0.1.1"
-	"github.com/vmihailenco/tagparser v0.1.1/go.mod"
-	"github.com/xanzy/ssh-agent v0.2.1"
-	"github.com/xanzy/ssh-agent v0.2.1/go.mod"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18"
-	"github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557"
-	"github.com/xlab/treeprint v0.0.0-20161029104018-1d6e34225557/go.mod"
-	"github.com/yuin/goldmark v1.1.25/go.mod"
-	"github.com/yuin/goldmark v1.1.27/go.mod"
-	"github.com/yuin/goldmark v1.1.32/go.mod"
-	"github.com/yuin/goldmark v1.2.1/go.mod"
-	"github.com/zclconf/go-cty v1.0.0/go.mod"
-	"github.com/zclconf/go-cty v1.1.0/go.mod"
-	"github.com/zclconf/go-cty v1.2.0/go.mod"
-	"github.com/zclconf/go-cty v1.8.0"
-	"github.com/zclconf/go-cty v1.8.0/go.mod"
-	"github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod"
-	"github.com/zclconf/go-cty-yaml v1.0.2"
-	"github.com/zclconf/go-cty-yaml v1.0.2/go.mod"
-	"go.opencensus.io v0.21.0/go.mod"
-	"go.opencensus.io v0.22.0/go.mod"
-	"go.opencensus.io v0.22.2/go.mod"
-	"go.opencensus.io v0.22.3/go.mod"
-	"go.opencensus.io v0.22.4"
-	"go.opencensus.io v0.22.4/go.mod"
-	"go.uber.org/atomic v1.3.2"
-	"go.uber.org/atomic v1.3.2/go.mod"
-	"go.uber.org/multierr v1.1.0"
-	"go.uber.org/multierr v1.1.0/go.mod"
-	"go.uber.org/zap v1.9.1"
-	"go.uber.org/zap v1.9.1/go.mod"
-	"golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod"
-	"golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod"
-	"golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190222235706-ffb98f73852f/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod"
-	"golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod"
-	"golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod"
-	"golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod"
-	"golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9"
-	"golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod"
-	"golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod"
-	"golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod"
-	"golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod"
-	"golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod"
-	"golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod"
-	"golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod"
-	"golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod"
-	"golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod"
-	"golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod"
-	"golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod"
-	"golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod"
-	"golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod"
-	"golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod"
-	"golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod"
-	"golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod"
-	"golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod"
-	"golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod"
-	"golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod"
-	"golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod"
-	"golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod"
-	"golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod"
-	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b"
-	"golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod"
-	"golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod"
-	"golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod"
-	"golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod"
-	"golang.org/x/mod v0.1.0/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod"
-	"golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod"
-	"golang.org/x/mod v0.2.0/go.mod"
-	"golang.org/x/mod v0.3.0"
-	"golang.org/x/mod v0.3.0/go.mod"
-	"golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod"
-	"golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod"
-	"golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod"
-	"golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod"
-	"golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod"
-	"golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod"
-	"golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod"
-	"golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod"
-	"golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod"
-	"golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod"
-	"golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod"
-	"golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod"
-	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod"
-	"golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod"
-	"golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod"
-	"golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod"
-	"golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod"
-	"golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod"
-	"golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod"
-	"golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod"
-	"golang.org/x/net v0.0.0-20191126235420-ef20fe5d7933/go.mod"
-	"golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod"
-	"golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod"
-	"golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod"
-	"golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod"
-	"golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod"
-	"golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod"
-	"golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod"
-	"golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod"
-	"golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod"
-	"golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod"
-	"golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod"
-	"golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod"
-	"golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod"
-	"golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod"
-	"golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod"
-	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b"
-	"golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod"
-	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43"
-	"golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod"
-	"golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod"
-	"golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod"
-	"golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod"
-	"golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod"
-	"golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod"
-	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
-	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
-	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-	"golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod"
-	"golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod"
-	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
-	"golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod"
-	"golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod"
-	"golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod"
-	"golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod"
-	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
-	"golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod"
-	"golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod"
-	"golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod"
-	"golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod"
-	"golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod"
-	"golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod"
-	"golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod"
-	"golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod"
-	"golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod"
-	"golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9/go.mod"
-	"golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod"
-	"golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod"
-	"golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod"
-	"golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod"
-	"golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod"
-	"golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod"
-	"golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod"
-	"golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod"
-	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
-	"golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod"
-	"golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod"
-	"golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod"
-	"golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod"
-	"golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod"
-	"golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod"
-	"golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f"
-	"golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod"
-	"golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod"
-	"golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod"
-	"golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db/go.mod"
-	"golang.org/x/text v0.3.2/go.mod"
-	"golang.org/x/text v0.3.3/go.mod"
-	"golang.org/x/text v0.3.5"
-	"golang.org/x/text v0.3.5/go.mod"
-	"golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod"
-	"golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod"
-	"golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0"
-	"golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod"
-	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
-	"golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod"
-	"golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod"
-	"golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod"
-	"golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod"
-	"golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod"
-	"golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod"
-	"golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod"
-	"golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod"
-	"golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod"
-	"golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod"
-	"golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod"
-	"golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod"
-	"golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod"
-	"golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod"
-	"golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod"
-	"golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod"
-	"golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod"
-	"golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod"
-	"golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod"
-	"golang.org/x/tools v0.0.0-20191203134012-c197fd4bf371/go.mod"
-	"golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod"
-	"golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod"
-	"golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod"
-	"golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod"
-	"golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod"
-	"golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod"
-	"golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod"
-	"golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod"
-	"golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod"
-	"golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod"
-	"golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod"
-	"golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod"
-	"golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod"
-	"golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod"
-	"golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod"
-	"golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod"
-	"golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod"
-	"golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod"
-	"golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod"
-	"golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod"
-	"golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod"
-	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb"
-	"golang.org/x/tools v0.0.0-20201028111035-eafbe7b904eb/go.mod"
-	"golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1"
-	"golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod"
-	"google.golang.org/api v0.4.0/go.mod"
-	"google.golang.org/api v0.7.0/go.mod"
-	"google.golang.org/api v0.8.0/go.mod"
-	"google.golang.org/api v0.9.0/go.mod"
-	"google.golang.org/api v0.13.0/go.mod"
-	"google.golang.org/api v0.14.0/go.mod"
-	"google.golang.org/api v0.15.0/go.mod"
-	"google.golang.org/api v0.17.0/go.mod"
-	"google.golang.org/api v0.18.0/go.mod"
-	"google.golang.org/api v0.19.0/go.mod"
-	"google.golang.org/api v0.20.0/go.mod"
-	"google.golang.org/api v0.22.0/go.mod"
-	"google.golang.org/api v0.24.0/go.mod"
-	"google.golang.org/api v0.28.0/go.mod"
-	"google.golang.org/api v0.29.0/go.mod"
-	"google.golang.org/api v0.30.0/go.mod"
-	"google.golang.org/api v0.34.0"
-	"google.golang.org/api v0.34.0/go.mod"
-	"google.golang.org/appengine v1.1.0/go.mod"
-	"google.golang.org/appengine v1.4.0/go.mod"
-	"google.golang.org/appengine v1.5.0/go.mod"
-	"google.golang.org/appengine v1.6.1/go.mod"
-	"google.golang.org/appengine v1.6.5/go.mod"
-	"google.golang.org/appengine v1.6.6"
-	"google.golang.org/appengine v1.6.6/go.mod"
-	"google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod"
-	"google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod"
-	"google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod"
-	"google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod"
-	"google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod"
-	"google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod"
-	"google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod"
-	"google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod"
-	"google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod"
-	"google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod"
-	"google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod"
-	"google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod"
-	"google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod"
-	"google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod"
-	"google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod"
-	"google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod"
-	"google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod"
-	"google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod"
-	"google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod"
-	"google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod"
-	"google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod"
-	"google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod"
-	"google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod"
-	"google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod"
-	"google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod"
-	"google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod"
-	"google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod"
-	"google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod"
-	"google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod"
-	"google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod"
-	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d"
-	"google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod"
-	"google.golang.org/grpc v1.8.0/go.mod"
-	"google.golang.org/grpc v1.19.0/go.mod"
-	"google.golang.org/grpc v1.20.1/go.mod"
-	"google.golang.org/grpc v1.21.1/go.mod"
-	"google.golang.org/grpc v1.23.0/go.mod"
-	"google.golang.org/grpc v1.25.1/go.mod"
-	"google.golang.org/grpc v1.26.0/go.mod"
-	"google.golang.org/grpc v1.27.0/go.mod"
-	"google.golang.org/grpc v1.27.1"
-	"google.golang.org/grpc v1.27.1/go.mod"
-	"google.golang.org/grpc v1.28.0/go.mod"
-	"google.golang.org/grpc v1.29.1/go.mod"
-	"google.golang.org/grpc v1.30.0/go.mod"
-	"google.golang.org/grpc v1.31.0/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod"
-	"google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod"
-	"google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod"
-	"google.golang.org/protobuf v1.21.0/go.mod"
-	"google.golang.org/protobuf v1.22.0/go.mod"
-	"google.golang.org/protobuf v1.23.0/go.mod"
-	"google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod"
-	"google.golang.org/protobuf v1.24.0/go.mod"
-	"google.golang.org/protobuf v1.25.0"
-	"google.golang.org/protobuf v1.25.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15"
-	"gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod"
-	"gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod"
-	"gopkg.in/errgo.v2 v2.1.0/go.mod"
-	"gopkg.in/fsnotify.v1 v1.4.7/go.mod"
-	"gopkg.in/inf.v0 v0.9.0"
-	"gopkg.in/inf.v0 v0.9.0/go.mod"
-	"gopkg.in/ini.v1 v1.42.0"
-	"gopkg.in/ini.v1 v1.42.0/go.mod"
-	"gopkg.in/resty.v1 v1.12.0/go.mod"
-	"gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod"
-	"gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.1/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v2 v2.2.4/go.mod"
-	"gopkg.in/yaml.v2 v2.2.7/go.mod"
-	"gopkg.in/yaml.v2 v2.2.8"
-	"gopkg.in/yaml.v2 v2.2.8/go.mod"
-	"honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod"
-	"honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod"
-	"honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod"
-	"honnef.co/go/tools v0.0.1-2019.2.3/go.mod"
-	"honnef.co/go/tools v0.0.1-2020.1.3/go.mod"
-	"honnef.co/go/tools v0.0.1-2020.1.4/go.mod"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711"
-	"k8s.io/api v0.0.0-20190620084959-7cf5895f2711/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655"
-	"k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655/go.mod"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab"
-	"k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod"
-	"k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod"
-	"k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod"
-	"k8s.io/klog v0.3.1/go.mod"
-	"k8s.io/klog v0.4.0"
-	"k8s.io/klog v0.4.0/go.mod"
-	"k8s.io/klog/v2 v2.0.0/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod"
-	"k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf/go.mod"
-	"k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4"
-	"k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4/go.mod"
-	"rsc.io/binaryregexp v0.2.0/go.mod"
-	"rsc.io/quote/v3 v3.1.0/go.mod"
-	"rsc.io/sampler v1.3.0/go.mod"
-	"sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod"
-	"sigs.k8s.io/yaml v1.1.0"
-	"sigs.k8s.io/yaml v1.1.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+="${EGO_SUM_SRC_URI}"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	GOCACHE="${T}/go-cache" go build -mod=readonly \
-		-work -o "bin/${PN}" ./ || die
-}
-
-src_install() {
-	dobin bin/terraform
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
--- a/app-admin/terraform/terraform-0.14.11.ebuild
+++ b/app-admin/terraform/terraform-0.14.11.ebuild
@ -1,34 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit go-module
-
-DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
-HOMEPAGE="https://www.terraform.io/"
-
-EGO_PN="github.com/hashicorp/${PN}"
-SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-
-LICENSE="Apache-2.0 BSD-2 BSD-4 ECL-2.0 imagemagick ISC JSON MIT MIT-with-advertising MPL-2.0 unicode"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="test"
-
-DOCS=( {README,CHANGELOG}.md )
-
-src_compile() {
-	ego build -o bin/terraform
-}
-
-src_install() {
-	dobin bin/terraform
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog "If you would like to install shell completions please run:"
-	elog "    terraform -install-autocomplete"
-}
--- a/app-admin/terraform/terraform-0.15.5.ebuild
+++ b/app-admin/terraform/terraform-0.15.5.ebuild
--- a/app-admin/terraform/terraform-1.0.1.ebuild
+++ b/app-admin/terraform/terraform-1.0.1.ebuild
--- a/app-admin/terraform/terraform-1.0.10.ebuild
+++ b/app-admin/terraform/terraform-1.0.10.ebuild
--- a/app-admin/terraform/terraform-1.0.3.ebuild
+++ b/app-admin/terraform/terraform-1.0.3.ebuild
--- a/app-admin/terraform/terraform-1.0.4.ebuild
+++ b/app-admin/terraform/terraform-1.0.4.ebuild
--- a/app-admin/terraform/terraform-1.0.5.ebuild
+++ b/app-admin/terraform/terraform-1.0.5.ebuild
--- a/app-admin/terraform/terraform-1.0.6.ebuild
+++ b/app-admin/terraform/terraform-1.0.6.ebuild
--- a/app-admin/terraform/terraform-1.0.7.ebuild
+++ b/app-admin/terraform/terraform-1.0.7.ebuild
--- a/app-admin/terraform/terraform-1.0.8.ebuild
+++ b/app-admin/terraform/terraform-1.0.8.ebuild
--- a/app-admin/terraform/terraform-1.0.9.ebuild
+++ b/app-admin/terraform/terraform-1.0.9.ebuild
--- a/app-admin/terraform/terraform-1.1.2.ebuild
+++ b/app-admin/terraform/terraform-1.1.2.ebuild
--- a/app-admin/terraform/terraform-1.1.5.ebuild
+++ b/app-admin/terraform/terraform-1.1.5.ebuild
--- a/app-admin/terraform/terraform-1.2.2.ebuild
+++ b/app-admin/terraform/terraform-1.2.2.ebuild
@ -11,7 +11,7 @@ SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"

 LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"

 RESTRICT="test"

--- a/app-admin/terraform/terraform-1.2.3.ebuild
+++ b/app-admin/terraform/terraform-1.2.3.ebuild
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/bzip3/Manifest
+++ b/app-arch/bzip3/Manifest
@ -1,3 +1,3 @@
-DIST bzip3-1.1.1.tar.xz 255884 BLAKE2B 09c3b6fdfefc8b82b16f5adf45405d4b61e2188dbe93c1079ffa32560a591c4b5e4f03d0550573d54d79f7c1a4e9d0bf628deddddbf89b17722755248ff6fe41 SHA512 889cdcbf7cbc4972762830d3794c13202b308da039794758d243216f1768a6bbb7660ac4341a3ddb73629c943c830000372e21e1a40b2e1091d05b9e6c54fa26
 DIST bzip3-1.1.2.tar.xz 256108 BLAKE2B a5f91fe2760fd4f7f79b908d735d613823dedac23e59950317c26f50d0a657dde042e5a08d401984c14d686d33726caa81e4b34cbca26e28c57a96f61e4f23ab SHA512 8b179bfe9b1b67c516580934cd12a640c86b3f9525c5e7902672051d80198cb91aa8880a4ca3ce14a879d26873405c713f1a0c6a33138d21f4d51c9e93d8fac5
 DIST bzip3-1.1.3.tar.xz 257212 BLAKE2B cc94b4c2caa3123b2c775d66143757bcaea7ead6d8a130391d6714583cfcb92fffca47ad80ffc8b5a01483f6cbfab7101c96521cd97e740116c9e10c64c358e8 SHA512 d48695d066ddc79e81c189f8c06e999f8eb8191982db8908f7bd4dfaa0f8fab1ba57e41664962cc6e8611f8398603918e4bd4d58efff2f04292ea54983a6f38d
+DIST bzip3-1.1.4.tar.xz 260404 BLAKE2B ddd087b631c9d5945dea0f4da280dfd74fd303eaed10f7553f770ca18b3b65f00718c073d87e565602a9ed02f4604a0d2dda0ff42cbd38f593bb012f5362cc5c SHA512 86f26b290001d255ad1d2378b5e2d59f9c85e1625ba5d7dca86acd544bb80af95b3379c215a03e0f81f77b7972a852d37746c1028464f404d28a6f9b707383b8
--- a/app-arch/bzip3/bzip3-1.1.1-r1.ebuild
+++ b/app-arch/bzip3/bzip3-1.1.1-r1.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/kspalaiologos/${PN}.git"
 else
 	SRC_URI="https://github.com/kspalaiologos/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~loong ~x86"
 fi

 LICENSE="LGPL-3+"
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/borgbackup/Manifest
+++ b/app-backup/borgbackup/Manifest
@ -1,3 +1,2 @@
 DIST borgbackup-1.1.17.tar.gz 3781411 BLAKE2B 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 SHA512 6170680efcca35341031a8fcfd9434d2dca530bb6f7fcabbf452e6af6a8df5a825b4991d342f3c97bd7378d56b9ee86e6118f9281a31ba51235f49818852f4bb
-DIST borgbackup-1.2.0.tar.gz 4020793 BLAKE2B 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec SHA512 c06a797439078118fc57418be2a9af64e84248659ba25cfc04dff7c67f9f52a033a11cd1e830410be390ae59dcacd2474f97d8b5886db7d4910486d0ad9b7c51
 DIST borgbackup-1.2.1.tar.gz 4017050 BLAKE2B 2841f3c02b6af76aba61064513ebd9039367be868a5f0dad2e10cbf3243236a5d29609bee63b79056f2a553052d3dc415178dbabd5c1e5af9c43111286942869 SHA512 47e95960c9ce7715897834f400ee1a3dcbbbd9aa1e4b69dc93618ade24caf6c046b844c9f3edd10e090795d06bed0136fbd42d6e679f0639f221b83d82545d43
--- a/app-backup/borgbackup/borgbackup-1.2.0.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.0.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/borg.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-fi
-
-DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
-HOMEPAGE="https://borgbackup.readthedocs.io/"
-
-LICENSE="BSD"
-SLOT="0"
-
-# Unfortunately we have a file conflict with app-office/borg, bug #580402
-RDEPEND="
-	!!app-office/borg
-	app-arch/lz4
-	virtual/acl
-	dev-python/pyfuse3[${PYTHON_USEDEP}]
-	=dev-python/msgpack-1.0.3[${PYTHON_USEDEP}]
-	dev-libs/openssl:0=
-"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	${RDEPEND}
-"
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/man/*
-}
--- a/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.2.1-r2.ebuild
@ -22,12 +22,14 @@ LICENSE="BSD"
 SLOT="0"

 # Unfortunately we have a file conflict with app-office/borg, bug #580402
+# borgbackup is *very* picky about which msgpack it work with,
+# check setup.py on bumps.
 RDEPEND="
 	!!app-office/borg
 	app-arch/lz4
 	virtual/acl
 	dev-python/pyfuse3[${PYTHON_USEDEP}]
-	=dev-python/msgpack-1.0.4[${PYTHON_USEDEP}]
+	~dev-python/msgpack-1.0.4[${PYTHON_USEDEP}]
 	dev-libs/openssl:0=
 "

--- a/app-backup/borgbackup/borgbackup-9999.ebuild
+++ b/app-backup/borgbackup/borgbackup-9999.ebuild
@ -22,19 +22,21 @@ LICENSE="BSD"
 SLOT="0"

 # Unfortunately we have a file conflict with app-office/borg, bug #580402
+# borgbackup is *very* picky about which msgpack it work with,
+# check setup.py on bumps.
 RDEPEND="
 	!!app-office/borg
 	app-arch/lz4
 	virtual/acl
 	dev-python/pyfuse3[${PYTHON_USEDEP}]
-	=dev-python/msgpack-1.0.3[${PYTHON_USEDEP}]
+	~dev-python/msgpack-1.0.4[${PYTHON_USEDEP}]
 	dev-libs/openssl:0=
 "

 DEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.29[${PYTHON_USEDEP}]
 	dev-python/pkgconfig[${PYTHON_USEDEP}]
 	${RDEPEND}
 "
--- a/app-backup/deja-dup/metadata.xml
+++ b/app-backup/deja-dup/metadata.xml
@ -25,7 +25,6 @@
 	backup apps.
 	</longdescription>
 	<upstream>
-		<remote-id type="gitlab">https://gitlab.gnome.org/World/deja-dup</remote-id>
 		<bugs-to>https://gitlab.gnome.org/World/deja-dup/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/adcli/metadata.xml
+++ b/app-crypt/adcli/metadata.xml
@ -9,7 +9,4 @@
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
  </maintainer>
-  <upstream>
-    <remote-id type="gitlab">https://gitlab.freedesktop.org/realmd/adcli</remote-id>
-  </upstream>
 </pkgmetadata>
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/doxygen/doxygen-1.9.4.ebuild
+++ b/app-doc/doxygen/doxygen-1.9.4.ebuild
@ -4,6 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"

 inherit cmake flag-o-matic llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
--- a/app-doc/doxygen/doxygen-9999.ebuild
+++ b/app-doc/doxygen/doxygen-9999.ebuild
@ -4,6 +4,7 @@
 EAPI=7

 PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"

 inherit cmake flag-o-matic llvm python-any-r1
 if [[ ${PV} = *9999* ]]; then
--- a/app-doc/kicad-doc/Manifest
+++ b/app-doc/kicad-doc/Manifest
@ -1,2 +1,2 @@
 DIST kicad-doc-5.1.12.tar.bz2 74217615 BLAKE2B f0906fdb0cf697348e06b63ef0003630a9035d47732c9a22ed3c4fee2f21c02f85fda51eee5149291b72326adc4899b31198178ee6e6ac0d494361cec6c06208 SHA512 db678d91ea5f564ca3f266829c297362cfd6cf35a5dced2ede5e7c9c38a37ca1037b264ee9314fa5c4a9d8197fcd92484ad4cae3668ea9741947d38c7ac7f910
-DIST kicad-doc-6.0.5.tar.gz 79736553 BLAKE2B cd06e5110e10da76d6640aed0ea44f68bdb14e5aca10c35b34a5b87f8a7a44faa67353216aced053123fcbe80a5159839e9a115761e599824bce31fb56c863fe SHA512 c53c488de171232de44c7e07c6078ef5da0c56d5fc377e127f8a2b7d134528c991467d40a150237425b0b5a1c082eaa1ab5f17c5a8fd62a3e37482c1de795aac
+DIST kicad-doc-6.0.6.tar.gz 80517799 BLAKE2B 58d1bab65637e65b8ce79f6e8e9e913a1fb0d5d22a1241c7d10f0440c12a6f8ac2b758d6852a1138fe0587bc695905c0f2b2d017e79e7e5283ecb4e49ab1d5ff SHA512 90f809ea5923b59169884e090263ccb2c0a9705ddc4ce3817e78736dbebb820a6189eeca4058919b6a53164d8f75746b49bc7667e5e0e534e0c9d3fa8af1f44a
--- a/app-doc/kicad-doc/kicad-doc-6.0.6.ebuild
+++ b/app-doc/kicad-doc/kicad-doc-6.0.6.ebuild
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/okteta/okteta-0.26.9.ebuild
+++ b/app-editors/okteta/okteta-0.26.9.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/okteta/ https://utils.kde.org/projects/okteta/"

 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 fi

 LICENSE="GPL-2 handbook? ( FDL-1.2 )"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/compat/compat-28.1.1.3.ebuild
+++ b/app-emacs/compat/compat-28.1.1.3.ebuild
@ -24,3 +24,20 @@ ELISP_TEXINFO="${PN}.texi"
 src_compile() {
 	emake compile ${PN}.info
 }
+
+src_test() {
+	local has_json="$("${EMACS}" ${EMACSFLAGS} --eval "(princ (fboundp 'json-parse-string))")"
+	if [[ "${has_json}" != t ]] ; then
+		local line
+		while read line ; do
+			ewarn "${line}"
+		done <<-EOF
+		Your current Emacs version does not support native JSON parsing,
+		which is required for running tests of ${CATEGORY}/${PN}.
+		Emerge >=app-editors/emacs-27 with USE="json" and use "eselect emacs"
+		to select that version.
+		EOF
+	else
+		emake test
+	fi
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/wine-gecko/metadata.xml
+++ b/app-emulation/wine-gecko/metadata.xml
@ -5,11 +5,8 @@
 		<email>wine@gentoo.org</email>
 		<name>Wine</name>
 	</maintainer>
-	<longdescription>
-		A Mozilla Gecko based version of Internet Explorer for Wine
-	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">wine/wine-gecko</remote-id>
+		<remote-id type="sourceforge">wine</remote-id>
 	</upstream>
 	<use>
 		<flag name="shared">Install pre-unpacked files which do not need to be copied into the Wine prefix</flag>
--- a/app-laptop/Manifest.gz
+++ b/app-laptop/Manifest.gz
--- a/app-laptop/tuxedo-control-center-bin/Manifest
+++ b/app-laptop/tuxedo-control-center-bin/Manifest
@ -1 +1 @@
-DIST tuxedo-control-center_1.1.0.rpm 71893232 BLAKE2B f41702ba7faae2375e95a0bfe838dace738eb9f34364bac78bba405ca791c0b055ff7c7a05572172b04ec1acd87dad7e3abc29df06bba84296a8bc4c76d5d9c5 SHA512 3b98f27ada98ff77d0fc84425042dc63431fcd169ba28f5a0585589846e8dca1405a9d258bdf90f86d0e363a827bafa80e58c8dd56e94042e3b0f0d726737e05
+DIST tuxedo-control-center_1.1.4.rpm 86231740 BLAKE2B be8b7d7c6de05601acd90a89b3e6bb89c5e251a94a18c7f1021e88797fbc1fc9c580545ca3d86e1ebf11f689d2454d4b6eac1736be0a31eabf28668d0ca0b32c SHA512 80e0c0f8ba81b8fe7bee2ec86b13a5f50c2a174b4260b7922a58df821a0b2ae89cd40c87e41c48de0a9e24a56ec1ad5123a664fc94123b95c05e61801db67072
--- a/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.0-r2.ebuild
+++ b/app-laptop/tuxedo-control-center-bin/tuxedo-control-center-bin-1.1.0-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -17,7 +17,7 @@ KEYWORDS="-* ~amd64"

 RESTRICT="strip splitdebug"

-DEPEND="sys-power/tuxedo-cc-wmi"
+DEPEND=">=app-laptop/tuxedo-keyboard-3.0.0"
 RDEPEND="${DEPEND}"
 # See bug #827729
 BDEPEND="app-arch/xz-utils[extra-filters]"
--- a/app-laptop/tuxedo-keyboard/Manifest
+++ b/app-laptop/tuxedo-keyboard/Manifest
@ -1,2 +1 @@
-DIST tuxedo-keyboard-2.0.5.tar.gz 31001 BLAKE2B 931d011e2ac521cef1670a8952886c1ac9b2476c6227c2b3cfce28d52622d3869f3c55773279eea3cbcc94d7c5b12d5d5653a8e2f9c142d0c044fa23fddd958c SHA512 3b7a9331d04e2918f3452f9561b05f39ea458960c2ade299a368899638987178cfd33fa066a0835f88b14c240d7937692d7994ccf978749ea7fdc428e587e06a
-DIST tuxedo-keyboard-3.0.8.tar.gz 50046 BLAKE2B 0457127a1f64a4d39a97b66cc50846aed86ba1249163e0958cc4da69476b367070815f859bfd1df2391e6480093e51ea29e26bd05ade9763d85d53bab4f6011a SHA512 f564980b8a353f9b6d6121f3b9d4408e7ab1b26d5587cedbe85acac8a93779af1be1b224927fa0f2a25ee50e6b1c6dd8401949fd54a6e89c1304ae057c777e7c
+DIST tuxedo-keyboard-3.0.10.tar.gz 50759 BLAKE2B 08fec486f6555ff5b8de6b1ea49ce504747238284fda31b05686fd5955bf3bb3fc48b49c40b50c1bbdfcbf4af2f206a99f645b294ebceafec4c87751fd460090 SHA512 a3c5b74fc5587763f131a66f507c0b33d462ed87c8e05391152c09d1425b5e1771bfb08cc2d1e3bb73b02074f503d866ea463fd44fb06d00b38c6ac4cfcd4e3b
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5-r1.ebuild
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-2.0.5-r1.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod toolchain-funcs
-
-DESCRIPTION="Kernel Module for Tuxedo Keyboard"
-HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
-SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BUILD_TARGETS="all"
-MODULE_NAMES="tuxedo_keyboard(tuxedo:${S}:src)"
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
-}
--- a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.10.ebuild
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.10.ebuild
@ -1,7 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
+CONFIG_CHECK="ACPI_WMI"

 inherit linux-mod toolchain-funcs

--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/pwsh-bin/Manifest
+++ b/app-shells/pwsh-bin/Manifest
@ -4,3 +4,6 @@ DIST powershell-7.2.1-linux-x64.tar.gz 69668637 BLAKE2B c173216df2147e5f857533cf
 DIST powershell-7.2.4-linux-arm32.tar.gz 66241774 BLAKE2B 6a37a929b3f315c00fa4da97d9a3a1f394224a35d03121b610b46de765dbf20ecbc6603250245fa4b07e666761a48a61c172ebb7e5d36f027ef7e985d4ac2734 SHA512 9d87bd111e6513f0771632bd6ae656d8a6488427707875b85c0b28cced5a2879a0c311a48e280dd9947ac767fed3ecc916441b04cf29bd80467715411858e899
 DIST powershell-7.2.4-linux-arm64.tar.gz 64769626 BLAKE2B 855daf5f18f5e5645d0efadc5b6db06175f9650f215c6e76a4348081685d368b93abd3cab145593074899c5ecd4b4f622bb0a3730181ccf2137d9b08a4b0ed4e SHA512 a1538b3a12824ffde0d75e5a0e047d0d39fd697ecac691285c39656a7e507fb0ca02d5fa2594d575cda70b1b1ff858f157f1160fc7320d3d342fe226ea67d7c6
 DIST powershell-7.2.4-linux-x64.tar.gz 69406638 BLAKE2B b7676de3c23417d92b7540754d94dbefa829d98ddedc4045de2b220bebc54a44fddc59538f6cfaaea69e67d5d46d67767c446777b29d22654b8e26858c29a6c0 SHA512 748c0459f00d52066c6da38bff88d03a25fcf65a9a9318614fd21f4984da8e459e0c0461663f23dd716fb285bbfeb406b88f6cf30aa9dd3eb356b2a850792f45
+DIST powershell-7.2.5-linux-arm32.tar.gz 66201903 BLAKE2B cdf6b2f53b0392fdc9a4f2761dc13406be7b87e6814e926bb7838c64d27edb92839bca41e3e1993cc3316eaac21d025b57ebdbdd55a88c209b9b84946c36fe7d SHA512 5eff39888d9c375ff891371b8fd2ef8c9a2ff5917504c1569733767d2def33aa047836a54f4f15f6260adf46a05f4e8ae912ba2e86029c4a34cd47bb5085d9b4
+DIST powershell-7.2.5-linux-arm64.tar.gz 64716033 BLAKE2B 06df8b25795f4df10c057acc8d001c46bcf4f5137e8d4a841216c172ffdb20d6ba3b31528f2f766a91ccbe1bc62f202ba78acef4a6af732a20035aac4a5ef9be SHA512 3ff38d1b109c0b9fdd8d20aa9ddd817424cf7883da7f4f16dcdb70c0f1260841ea6f61a3a675aabc471722920c8ba8f25a24885825cc7e29a9d5617876c070dd
+DIST powershell-7.2.5-linux-x64.tar.gz 69364625 BLAKE2B 71a91e9d8196cca8a903fdeac1c8b4a7f6ad9c21d649fc5aeaf1cf3033cde3141219513b2a9661d36280c95746cfc0b4c47b3fe3cecff4f9feaffe60043c0743 SHA512 96efbcf4f325338bc9aa4da7b955366cc49bae89a98d5ad53840386aefed59e929b62d91d5bdbbe57e4bf471cd31c57e1fa5b4cd42f60b797bb438c165cf432e
--- a/app-shells/pwsh-bin/pwsh-bin-7.2.5.ebuild
+++ b/app-shells/pwsh-bin/pwsh-bin-7.2.5.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PowerShell - binary precompiled for glibc"
+HOMEPAGE="https://powershell.org/"
+BASE_URI="https://github.com/PowerShell/PowerShell/releases/download"
+SRC_URI="
+	amd64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-x64.tar.gz )
+	arm?   ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm32.tar.gz )
+	arm64? ( ${BASE_URI}/v${PV}/powershell-${PV}-linux-arm64.tar.gz )
+"
+S=${WORKDIR}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE="+pwsh-symlink"
+REQUIRED_USE="elibc_glibc"
+
+RDEPEND="
+	app-crypt/mit-krb5:0/0
+	dev-util/lttng-ust:0
+	sys-libs/pam:0/0
+	sys-libs/zlib:0/1
+	|| (
+		dev-libs/openssl-compat:1.0.0
+		=dev-libs/openssl-1.0*:0/0
+	)
+	pwsh-symlink? ( !app-shells/pwsh )
+"
+
+QA_PREBUILT="*"
+
+src_install() {
+	local dest=opt/pwsh
+	dodir ${dest}
+
+	local broken_symlinks=( libcrypto.so.1.0.0 libssl.so.1.0.0 )
+	local symlink
+	for symlink in "${broken_symlinks[@]}" ; do
+		[[ -L ${symlink} ]] && { rm "${symlink}" || die ; }
+	done
+
+	mv "${S}/"* "${ED}"/${dest}/ || die
+	fperms 0755 /${dest}/pwsh
+
+	dosym ../../${dest}/pwsh /usr/bin/pwsh-bin
+	use pwsh-symlink && dosym ../../${dest}/pwsh /usr/bin/pwsh
+}
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/calibre/calibre-5.44.0-r1.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r1.ebuild
@ -68,7 +68,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
 		>=dev-python/msgpack-0.6.2[${PYTHON_USEDEP}]
 		>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-		>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pillow-3.2.0[truetype,${PYTHON_USEDEP}]
 		>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
 		>=dev-python/pychm-0.8.6[${PYTHON_USEDEP}]
 		dev-python/pycryptodome[${PYTHON_USEDEP}]
--- a/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.19.ebuild
@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""

 DEPEND="~dev-libs/xapian-${PV}:0/30
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r2.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.8-r2.ebuild
@ -20,7 +20,7 @@ HOMEPAGE="https://git.pwmt.org/pwmt/zathura-pdf-mupdf"
 LICENSE="ZLIB"
 SLOT="0"

-DEPEND=">=app-text/mupdf-1.19:=
+DEPEND="~app-text/mupdf-1.19.1:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
--- a/app-vim/jedi/Manifest
+++ b/app-vim/jedi/Manifest
@ -1 +1 @@
-DIST jedi-0.10.0.tar.gz 36820 BLAKE2B a66f7c58564487d83867d61480d83364af0047cee713c41dbd5c67bff0b2ac33d066c2d0f4367c30059f46fb9f4916fc8d2eb9c64aa6a489e2c16a03f56b0b3c SHA512 65482505446b1001e92870ae64a147b38c0bb4d3151e464d325be741729506a191b284a491f4c3eb77dc46cb9bcd6b8e7bf8689ed95107e89a1f6a05c7fbc9ea
+DIST jedi-0.11.0.tar.gz 41606 BLAKE2B 146f60f43a3fc764c66e2ca94c2b4051be3e25b5a94ca3f6d82533b624433946013c7df38e61262e6ac40a00de9d3b9b0e647e794191b6deb8ed09124d2accc7 SHA512 a151fdf4d58adc36dbe9ede8e091ae00c8bd8237b66c512b4addfb6e7e436651848da2b3a0dbcbbef615bcc394e7e28a6e127e53f2205dc61f4d46a2ff0faa12
--- a/app-vim/jedi/jedi-0.10.0.ebuild
+++ b/app-vim/jedi/jedi-0.10.0.ebuild
@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit vim-plugin python-single-r1
-
-DESCRIPTION="vim plugin: binding to the autocompletion library jedi"
-HOMEPAGE="https://github.com/davidhalter/jedi-vim"
-SRC_URI="https://github.com/davidhalter/jedi-vim/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep 'dev-python/jedi[${PYTHON_USEDEP}]')
-	app-editors/vim[python]"
-BDEPEND="${PYTHON_DEPS}
-	test? ( dev-python/pytest )"
-
-S="${WORKDIR}/jedi-vim-${PV}"
-
-# Tests are broken.
-RESTRICT="test"
-
-# Makefile tries hard to call tests so let's silence this phase.
-src_compile() { :; }
-
-src_test() {
-	epytest
-}
--- a/app-vim/jedi/jedi-0.11.0.ebuild
+++ b/app-vim/jedi/jedi-0.11.0.ebuild
@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit edo vim-plugin python-single-r1
+
+MY_PN="${PN}-vim"
+DESCRIPTION="vim plugin: binding to the autocompletion library jedi"
+HOMEPAGE="https://github.com/davidhalter/jedi-vim"
+SRC_URI="https://github.com/davidhalter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '>=dev-python/jedi-0.18[${PYTHON_USEDEP}]')
+	|| (
+		app-editors/vim[python,${PYTHON_SINGLE_USEDEP}]
+		app-editors/gvim[python,${PYTHON_SINGLE_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		app-vim/vspec
+	)
+"
+
+DOCS=( AUTHORS.txt CONTRIBUTING.md README.rst )
+
+src_prepare() {
+	vim-plugin_src_prepare
+
+	rm doc/logotype-a.svg || die
+	rmdir pythonx/{jedi,parso} || die
+
+	# Disable failing tests
+	sed -i test/vspec/signatures.vim \
+		-e "/it 'highlights correct argument'/a SKIP 'fail'" || die
+}
+
+# Makefile tries hard to call tests so let's silence this phase.
+src_compile() { :; }
+
+src_test() {
+	local bindir="${S}"/venv/bin
+	local sitedir="${S}"/venv/lib/${EPYTHON}/site-packages
+
+	mkdir -p "${bindir}" || die
+	mkdir -p "${sitedir}" || die
+	ln -s "${PYTHON}" "${bindir}/${EPYTHON}" || die
+	ln -s "${EPYTHON}" "${bindir}/python3" || die
+	ln -s "${EPYTHON}" "${bindir}/python" || die
+	cat > "${bindir}"/pyvenv.cfg <<-EOF || die
+		include-system-site-packages = false
+	EOF
+
+	ln -s "$(python_get_sitedir)"/parso "${sitedir}"/parso || die
+	cp -r "$(python_get_sitedir)"/parso-*.dist-info "${sitedir}" || die
+
+	ln -s "$(python_get_sitedir)"/jedi "${sitedir}"/jedi || die
+	cp -r "$(python_get_sitedir)"/jedi-*.dist-info "${sitedir}" || die
+
+	export PATH="${bindir}:${PATH}"
+	unset PYTHONPATH
+
+	edo prove-vspec -d "${S}" test/vspec
+}
+
+src_install() {
+	vim-plugin_src_install pythonx
+	python_optimize "${ED}"/usr/share/vim/vimfiles/pythonx
+}
--- a/app-vim/vspec/Manifest
+++ b/app-vim/vspec/Manifest
@ -0,0 +1 @@
+DIST vspec-1.9.2.tar.gz 28882 BLAKE2B 016b91e2eb9ef5b6d8ebf563ddd620ce9e57dc4a9d013a67b3d5cf644325c49f02aaef8b3a114b6802494ca026989ff56ab1f0cb5e398f6cc9eb91fee96797ea SHA512 0c453743f73cfc5990fcb7222cc6fc1b96b93b15b4ef701562f84ae8ef2961c0e2e256f32a400218518463b932a3efdba33e3ca0b418f3ac6969ab38aeaf348c
--- a/dev-python/pypeg2/metadata.xml
+++ b/dev-python/pypeg2/metadata.xml
@ -2,10 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
+		<email>vim@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">pyPEG2</remote-id>
+		<remote-id type="github">kana/vim-vspec</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-vim/vspec/vspec-1.9.2.ebuild
+++ b/app-vim/vspec/vspec-1.9.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit edo vim-plugin
+
+DESCRIPTION="A testing framework for Vim script"
+HOMEPAGE="
+	https://www.vim.org/scripts/script.php?script_id=3012
+	https://github.com/kana/vim-vspec
+"
+SRC_URI="https://github.com/kana/vim-${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/vim-${P}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/perl:*"
+BDEPEND="test? ( ${RDEPEND} )"
+
+VIM_PLUGIN_HELPFILES="vspec.txt"
+
+# Uncomment on the next release
+#DOCS=( {README,TUTORIAL_CI}.md )
+
+src_prepare() {
+	vim-plugin_src_prepare
+
+	# remove failing tests
+	rm t/{indent,syntax}.vim || die
+}
+
+src_test() {
+	export LC_ALL=C
+	edo ./bin/prove-vspec
+}
+
+src_install() {
+	# fix paths for the binary to be installed; don't do it in src_prepare
+	# as it will make the tests fail
+	sed "s|\$0|${EPREFIX}/usr/share/vim/vimfiles/bin/vspec|g" \
+		-i bin/vspec || die
+
+	vim-plugin_src_install bin
+
+	fperms +x /usr/share/vim/vimfiles/bin/{vspec,prove-vspec}
+	dosym -r {/usr/share/vim/vimfiles,/usr}/bin/vspec
+	dosym -r {/usr/share/vim/vimfiles,/usr}/bin/prove-vspec
+}
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
--- a/dev-go/gopls/metadata.xml
+++ b/dev-go/gopls/metadata.xml
@ -5,6 +5,6 @@
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">golang/tools/gopls</remote-id>
+		<remote-id type="github">golang/tools</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/fec/metadata.xml
+++ b/dev-java/fec/metadata.xml
@ -9,7 +9,4 @@
 		<email>java@gentoo.org</email>
 		<name>Java</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">onionnetworks</remote-id>
-	</upstream>
 </pkgmetadata>
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@ -3,5 +3,4 @@ DIST NotoEmoji-Regular.ttf 418804 BLAKE2B e94f7b1d5bced052ff3f15a32ecce8f0f1dc2e
 DIST NotoSansSC-Regular.otf 8481960 BLAKE2B 3eee2c1e6be5e013d2ed679ccb361221e3e410150c7dc32d570382355e80e540c71be9009ece9951eea2379fb08fc05d8bcd65e941677660c55b450d660e8b03 SHA512 cbdd317d16099d24736457eef631353c7830a1a3c132b01f2cdc1e6a0c21a78e3b1fe8479b3f40179e7630a15cc23a093775bb22d521dba39376bb367d497b21
 DIST OpenSans-Regular.pfb 100962 BLAKE2B ff906c67a79df9d8deb9736f7439ba5429b72940b6a6fa49751fdea88adef70a3b57f28b2c31014da3206efe601095a8caeb98382fb36f8544afd0bec5cce355 SHA512 2787fcecc0feb1c9e6ff0d8de6193658413863e44eaab572751ca7e6c3b369c0a9731f4952cb0821f307760f0422f77c5f0d3fe7df6b054643fb39423e8d70ee
 DIST SourceSansProBold.otf 104072 BLAKE2B 2c6538ed97cca04a6a38a1bcca7def6c9e923f0e7a773c2715d50ca1a526b1ff683bc6544155b1e170fb828c3923d6b22cdf7017f9da9de164523f328c1cc187 SHA512 28a044a2685fbc8da7810d9ac7b6b93a95542d504d7d8e671f009b8ebb2f5b70c974be7ea78974b188d8e6ab17d65b08f276c054927857315d5aad26f6fe36fc
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
--- a/dev-java/fontbox/fontbox-2.0.24.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.24.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/fontbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild fontbox-2.0.24.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:fontbox:2.0.24"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip
-	test? (
-		https://issues.apache.org/jira/secure/attachment/12684264/SourceSansProBold.otf
-		https://issues.apache.org/jira/secure/attachment/12896461/NotoEmoji-Regular.ttf
-		https://issues.apache.org/jira/secure/attachment/12809395/DejaVuSansMono.ttf
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-# Common dependencies
-# POM: pdfbox-${PV}/${PN}/pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-
-CDEPEND="dev-java/commons-logging:0"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/pdfbox-${PV}/${PN}"
-
-JAVA_GENTOO_CLASSPATH="commons-logging"
-JAVA_SRC_DIR="src/main/java"
-JAVA_RESOURCE_DIRS="src/main/resources"
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
-
-src_test() {
-	mkdir --parents target/pdfs || die
-	cp "${DISTDIR}"/DejaVuSansMono.ttf \
-		"${DISTDIR}"/NotoEmoji-Regular.ttf \
-		"${DISTDIR}"/SourceSansProBold.otf \
-		"target/pdfs" || die
-
-	java-pkg-simple_src_test
-}
--- a/dev-java/fontbox/fontbox-2.0.26.ebuild
+++ b/dev-java/fontbox/fontbox-2.0.26.ebuild
@ -25,7 +25,7 @@ SRC_URI="mirror://apache/pdfbox/${PV}/pdfbox-${PV}-src.zip

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"

 # Common dependencies
 # POM: pdfbox-${PV}/${PN}/pom.xml
--- a/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
+++ b/dev-java/jakarta-mail-api/jakarta-mail-api-2.1.0.ebuild
@ -13,12 +13,12 @@ JAVA_TESTING_FRAMEWORKS="junit-4"
 inherit java-pkg-2 java-pkg-simple

 DESCRIPTION="Jakarta Mail API 2.1 Specification API"
-HOMEPAGE="https://projects.eclipse.org/projects/ee4j/jakarta.mail-api"
+HOMEPAGE="https://eclipse-ee4j.github.io/mail/"
 SRC_URI="https://github.com/eclipse-ee4j/mail/archive/${PV}.tar.gz -> ${P}.tar.gz"

 LICENSE="EPL-1.0 EPL-2.0 GPL-2-with-classpath-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"

 # Probably caused by --module-path missing @${test_sources}

--- a/dev-java/jakarta-mail-api/metadata.xml
+++ b/dev-java/jakarta-mail-api/metadata.xml
@ -7,4 +7,7 @@
 	<longdescription>
 		Jakarta Mail defines a platform-independent and protocol-independent framework to build mail and messaging applications.
 	</longdescription>
+	<upstream>
+		<remote-id type="github">eclipse-ee4j/mail</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-java/janino/janino-3.1.7.ebuild
+++ b/dev-java/janino/janino-3.1.7.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/janino-compiler/janino/archive/v3.1.7.tar.gz -> ${P}

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 # Common dependencies
 # POM: ${PN}/pom.xml
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@ -1,3 +1,2 @@
 DIST JDOM-2.0.6.1.tar.gz 8368301 BLAKE2B b9d5d8e611b9a0505c9576f2c4a2243eddd8a171bbe44d83440edf44154cae80138ddca8a0bceb3124a6825111d30641a28d645507a1bacad6a8cb9ad1dbccdd SHA512 c09b422b0635a478cb70e57e4c35bc7f505f6a2730be813d6e63c053814581e4dc3fdf431b945394c30ab37a8fb83fd103767f8de84d28bef79e95e2c37518e1
-DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
--- a/dev-java/jdom/files/build-xml-2.patch
+++ b/dev-java/jdom/files/build-xml-2.patch
@ -1,36 +0,0 @@
--- a/build.xml	2015-02-15 02:58:04.000000000 +0000
-+++ b/build.xml	2015-08-27 23:11:09.807800249 +0100
-@@ -267,7 +267,7 @@
- 		</javac>
- 	</target>
- 	
-	<target name="compile" depends="compile.core, compile.junit, compile.contrib, compile.samples"
-+	<target name="compile" depends="compile.core, compile.contrib, compile.samples"
- 	 		description="Compiles all JDOM code (core, samples, junit, contrib)" />
- 
- 	<!-- =================================================================== -->
-@@ -296,7 +296,7 @@
- 	<!-- =================================================================== -->
- 	<!-- Creates the jars                                           -->
- 	<!-- =================================================================== -->
-	<target name="jars" depends="compile, javadoc"
-+	<target name="jars" depends="compile"
- 	    description="Builds the Jars">
- 		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
- 		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
-@@ -320,6 +320,7 @@
- 			<fileset dir="${contrib.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
- 		</jar>
-+<!--
- 		<jar jarfile="${package}/${jarbase}-junit.jar" >
- 			<fileset dir="${junit.build}" includes="**/*" />
- 			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
-@@ -332,6 +333,7 @@
- 			<fileset dir="${contrib.src}" includes="**/*" />
- 		</jar>
- 	    	    
-+-->
- 	</target>
- 	
- 	<target name="androidtests" depends="jars">
--- a/dev-java/jdom/jdom-2.0.6-r5.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r5.ebuild
@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="JDOM-${PV}"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java API to manipulate XML data"
-SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
-HOMEPAGE="http://www.jdom.org"
-
-LICENSE="Apache-1.1"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	dev-java/iso-relax:0
-	dev-java/jaxen:1.2
-	dev-java/xalan:0"
-
-RDEPEND="
-	${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jars"
-EANT_TEST_TARGET="junit"
-EANT_GENTOO_CLASSPATH="iso-relax,jaxen-1.2,xalan"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/build-xml-2.patch"
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-
-	# Remove Android stuff to avoid junit RDEPEND.
-	rm -vr contrib/src/java/org/jdom2/contrib/android || die
-}
-
-src_install() {
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??.jar ${PN}.jar
-	java-pkg_newjar build/package/${PN}-${SLOT}.x-????.??.??.??.??-contrib.jar ${PN}-contrib.jar
-
-	dodoc {CHANGES,COMMITTERS,README,TODO}.txt
-	use doc && java-pkg_dojavadoc build/apidocs
-	use source && java-pkg_dosrc {contrib,core}/src/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
--- a/dev-java/jdom/jdom-2.0.6.1.ebuild
+++ b/dev-java/jdom/jdom-2.0.6.1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/hunterhacker/jdom/archive/${PN^^}-${PV}.tar.gz"

 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"

 # FAILURES!!!
 # Tests run: 1887,  Failures: 23
--- a/dev-java/pdfbox/Manifest
+++ b/dev-java/pdfbox/Manifest
@ -38,5 +38,4 @@ DIST genko_oc_shiryo1.pdf 124896 BLAKE2B c3a9921afb052ee4fe5080a1f1e66d991e3041f
 DIST ipag00303.zip 4295310 BLAKE2B b68dd7dd7a7320894d782350c4598572c31d6ef492f9572adc2aac20ca98b5c5027995c0169bf815bc1e3a64d635b0e2d4e378b749e034f2fe718bcb7901d40a SHA512 59535137c649a2f8bdbb463cd716426811a6003a65883ca6e45bb0af1d526b3889af0fba3a353e90bc8d373cd32b90a27ff9ff6916ecbccb42e922c09e9b046a
 DIST ipagp00303.zip 4295877 BLAKE2B e096303106029daaedae9befb003f70c2c7d00b858f89f5f8fffb9fc73679e63ec0dde8e0304cad2c611aa74d3cf1bfea56b9ac35e6838953d38b028654f5434 SHA512 26d0a9bfba7f5457a98b0bf45a4a6b081bca4140047a0886625691231459f8c81a6cdbe523e9abcbd45fd7caed21d78f1baf3a2cf9167320f6b79be3d697cb5b
 DIST n019003l.pfb 79155 BLAKE2B 2995cd6e35de2d49cc6d4a5f6c7461396b23e14c6403cd7aecedbd5cec904fd0c42a114c4c5f5079fd1fad306dd8ddba649a13424ec5183395fb0fc1cbe2abb9 SHA512 8eafe21ffa6f3d7d0a50e9f4e5bcdeb727e804b552d74e65b709e778c9ed4605e5aa63743be285f0bc17ad162768583fec4196e1d1146d98f8703359247f22d0
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
--- a/dev-java/pdfbox/pdfbox-2.0.24.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.24.ebuild
@ -1,291 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pdfbox-2.0.24/pdfbox/pom.xml --download-uri https://downloads.apache.org/pdfbox/2.0.24/pdfbox-2.0.24-src.zip --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild pdfbox-2.0.24.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.pdfbox:pdfbox:2.0.24"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library and utilities for working with PDF documents"
-HOMEPAGE="https://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip
-	test? (
-		https://issues.apache.org/jira/secure/attachment/12481683/1.pdf -> PDFBOX-1031-1.pdf
-		https://issues.apache.org/jira/secure/attachment/12481684/2.pdf -> PDFBOX-1031-2.pdf
-		https://issues.apache.org/jira/secure/attachment/12486525/1_testfile1.pdf -> PDFBOX-1065-1.pdf
-		https://issues.apache.org/jira/secure/attachment/12486526/2_testfile1.pdf -> PDFBOX-1065-2.pdf
-		https://issues.apache.org/jira/secure/attachment/12490774/a.pdf -> PDFBOX-1100-1.pdf
-		https://issues.apache.org/jira/secure/attachment/12490775/b.pdf -> PDFBOX-1100-2.pdf
-		https://issues.apache.org/jira/secure/attachment/12848122/SF1199AEG%20%28Complete%29.pdf -> PDFBOX-3656.pdf
-		https://issues.apache.org/jira/secure/attachment/12852207/test.pdf -> PDFBOX-3682.pdf
-		https://issues.apache.org/jira/secure/attachment/12888957/079977.pdf -> PDFBOX-3940-079977.pdf
-		https://issues.apache.org/jira/secure/attachment/12867113/202097.pdf -> PDFBOX-3785-202097.pdf
-		https://issues.apache.org/jira/secure/attachment/12890031/670064.pdf -> PDFBOX-3947-670064.pdf
-		https://issues.apache.org/jira/secure/attachment/12890034/EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf -> PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf
-		https://issues.apache.org/jira/secure/attachment/12890037/MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf -> PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf
-		https://issues.apache.org/jira/secure/attachment/12890042/23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf -> PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf
-		https://issues.apache.org/jira/secure/attachment/12890047/FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf -> PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf
-		https://issues.apache.org/jira/secure/attachment/12892097/c687766d68ac766be3f02aaec5e0d713_2.pdf -> PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf
-		https://issues.apache.org/jira/secure/attachment/12893582/63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf -> PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf
-		https://issues.apache.org/jira/secure/attachment/12896905/GeneralForbearance.pdf -> PDFBOX-3999-GeneralForbearance.pdf
-		https://issues.apache.org/jira/secure/attachment/12919726/sample.pdf -> PDFBOX-4197.pdf
-		https://issues.apache.org/jira/secure/attachment/12938094/Quelldatei.pdf -> PDFBOX-4308.pdf
-		https://issues.apache.org/jira/secure/attachment/12952086/form.pdf -> PDFBOX-4408.pdf
-		https://issues.apache.org/jira/secure/attachment/12953423/000314.pdf -> PDFBOX-4418-000314.pdf
-		https://issues.apache.org/jira/secure/attachment/12953421/000671.pdf -> PDFBOX-4418-000671.pdf
-		https://issues.apache.org/jira/secure/attachment/12953866/000746.pdf -> PDFBOX-4423-000746.pdf
-		https://issues.apache.org/jira/secure/attachment/12966453/cryptfilter.pdf -> PDFBOX-4517-cryptfilter.pdf
-		https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf -> PDFBOX-4750.pdf
-		https://issues.apache.org/jira/secure/attachment/12914331/WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf -> PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf
-		https://issues.apache.org/jira/secure/attachment/12962991/NeS1078.pdf -> PDFBOX-4490.pdf
-		https://issues.apache.org/jira/secure/attachment/12784025/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf
-		https://issues.apache.org/jira/secure/attachment/12867102/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf
-		https://issues.apache.org/jira/secure/attachment/12929821/16bit.png -> PDFBOX-4184-16bit.png
-		https://issues.apache.org/jira/secure/attachment/12943502/ArrayIndexOutOfBoundsException%20COSParser -> PDFBOX-4338.pdf
-		https://issues.apache.org/jira/secure/attachment/12943503/NullPointerException%20COSParser -> PDFBOX-4339.pdf
-		https://issues.apache.org/jira/secure/attachment/12867433/genko_oc_shiryo1.pdf
-		https://moji.or.jp/wp-content/ipafont/IPAfont/ipag00303.zip
-		https://moji.or.jp/wp-content/ipafont/IPAfont/ipagp00303.zip
-		https://issues.apache.org/jira/secure/attachment/12911053/n019003l.pfb
-		https://issues.apache.org/jira/secure/attachment/12949710/032163.jpg -> PDFBOX-4184-032163.jpg
-		https://issues.apache.org/jira/secure/attachment/13025718/lotus.jpg -> PDFBOX-5196-lotus.jpg
-	)"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="+tools"
-
-PROPERTIES="test_network"
-RESTRICT="test"
-
-# Common dependencies
-# POM: ${P}/${PN}/pom.xml
-# commons-logging:commons-logging:1.2 -> >=dev-java/commons-logging-1.2:0
-# org.apache.pdfbox:fontbox:2.0.24 -> >=dev-java/fontbox-2.0.24:0
-# org.bouncycastle:bcmail-jdk15on:1.64 -> >=dev-java/bcmail-1.68:0
-# org.bouncycastle:bcprov-jdk15on:1.64 -> >=dev-java/bcprov-1.68:0
-
-CDEPEND="
-	dev-java/bcmail:0
-	dev-java/bcprov:0
-	dev-java/commons-logging:0
-	~dev-java/fontbox-${PV}:0
-	tools? (
-		dev-java/java-diff-utils:0
-		dev-java/junit:4
-		dev-java/mockito:0
-	)"
-
-# Compile dependencies
-# POM: ${P}/${PN}/pom.xml
-# test? com.github.jai-imageio:jai-imageio-core:1.4.0 -> >=dev-java/jai-imageio-core-1.4.0:0
-# test? com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0 -> >=dev-java/jai-imageio-jpeg2000-1.4.0:0
-# test? com.googlecode.java-diff-utils:diffutils:1.3.0 -> >=dev-java/java-diff-utils-1.3.0:0
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.pdfbox:jbig2-imageio:3.0.3 -> >=dev-java/jbig2-imageio-3.0.3:0
-# test? org.mockito:mockito-core:3.10.0 -> !!!suitble-mavenVersion-not-found!!!
-
-DEPEND="${CDEPEND}
-	>=virtual/jdk-1.8:*
-	test? (
-		dev-java/jai-imageio-core:0
-		dev-java/jai-imageio-jpeg2000:0
-		dev-java/java-diff-utils:0
-		dev-java/jbig2-imageio:0
-		dev-java/mockito:0
-	)"
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-BDEPEND="app-arch/unzip"
-
-DOCS=( {README.md,{LICENSE,NOTICE,RELEASE-NOTES}.txt} )
-
-PATCHES=(
-	# adds @Ignore annotation to
-	# public void testPDFBox3826() throws IOException, URISyntaxException
-	# https://issues.apache.org/jira/browse/PDFBOX-3826
-	"${FILESDIR}"/2.0.24-tests-ignore.patch
-)
-
-S="${WORKDIR}/${P}"
-
-JAVA_GENTOO_CLASSPATH_EXTRA="pdfbox.jar:pdfbox-debugger.jar"
-JAVA_GENTOO_CLASSPATH="commons-logging,fontbox,bcmail,bcprov"
-JAVA_TEST_GENTOO_CLASSPATH="jai-imageio-core,jai-imageio-jpeg2000,java-diff-utils,jbig2-imageio,junit-4,mockito"
-
-JAVA_TEST_EXCLUDES=(
-	# excluded upstream according to
-	# https://github.com/apache/pdfbox/blob/8876e8e1a0adbf619cef4638cc3cea073e3ca484/pdfbox/pom.xml#L123
-	"org.apache.pdfbox.rendering.TestPDFToImage"
-
-	# 1) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 2) warning(junit.framework.TestSuite$1
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 3) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
-	"org.apache.pdfbox.cos.TestCOSBase"
-
-	# 4) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testFloatValue (java.lang.InstantiationException
-	# 5) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGet (java.lang.InstantiationException
-	# 6) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testInvalidNumber (java.lang.InstantiationException
-	# 7) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLongValue (java.lang.InstantiationException
-	# 8) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIntValue (java.lang.InstantiationException
-	# 9) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testLargeNumber (java.lang.InstantiationException
-	# 10) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testDoubleValue (java.lang.InstantiationException
-	# 11) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testIsSetDirect (java.lang.InstantiationException
-	# 12) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testAccept (java.lang.InstantiationException
-	# 13) warning(junit.framework.TestSuite$1)
-	# junit.framework.AssertionFailedError: Cannot instantiate test case: testGetCOSObject (java.lang.InstantiationException
-	"org.apache.pdfbox.cos.TestCOSNumber"	# Tests run: 10,  Failures: 10
-)
-
-src_prepare() {
-	default
-}
-
-src_compile() {
-	JAVA_SRC_DIR="pdfbox/src/main/java"
-	JAVA_RESOURCE_DIRS="pdfbox/src/main/resources"
-	JAVA_JAR_FILENAME="pdfbox.jar"
-	java-pkg-simple_src_compile
-
-	JAVA_SRC_DIR="debugger/src/main/java"
-	JAVA_RESOURCE_DIRS="debugger/src/main/resources"
-	JAVA_JAR_FILENAME="pdfbox-debugger.jar"
-	java-pkg-simple_src_compile
-
-	if use tools; then
-		JAVA_GENTOO_CLASSPATH+=" java-diff-utils,junit-4,mockito"
-		JAVA_SRC_DIR="tools/src/main/java"
-		JAVA_RESOURCE_DIRS=""
-		JAVA_JAR_FILENAME="pdfbox-tools.jar"
-		java-pkg-simple_src_compile
-	fi
-
-	JAVA_SRC_DIR=(
-		"${S}/pdfbox/src/main/java"
-		"${S}/debugger/src/main/java"
-	)
-	if use tools; then
-		JAVA_SRC_DIR+=( "${S}/tools" )
-	fi
-	JAVA_JAR_FILENAME="ignoreme.jar"
-	java-pkg-simple_src_compile
-}
-
-src_test() {
-	JAVA_TEST_SRC_DIR="pdfbox/src/test/java"
-	JAVA_TEST_RESOURCE_DIRS="pdfbox/src/test/resources"
-
-	# There was 1 failure
-	# 1) testIsEmbeddingPermittedMultipleVersions(org.apache.pdfbox.pdmodel.font.TestFontEmbedding)
-	# java.lang.ExceptionInInitializerError
-	# Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make protected final java.lang.Class java.lang.ClassLoader.defineClass(java.lang.String,byte[],int,int,java.security.ProtectionDomain) throws java.lang.ClassFormatError accessible: module java.base does not "opens java.lang" to unnamed module @4dc690f9
-	# FAILURES!!!
-	# Tests run: 586,  Failures: 1
-	local vm_version="$(java-config -g PROVIDES_VERSION)"
-	if [[ "${vm_version}" == "17" ]] ; then
-		JAVA_TEST_EXCLUDES+=( "org.apache.pdfbox.pdmodel.font.TestFontEmbedding" )
-	fi
-
-	# tests failed with S="${WORKDIR}/${P}"
-	find pdfbox/src/test/ -type f -exec sed -i 's:src/test/resources:pdfbox/src/test/resources:' {} + || die
-
-	mkdir --parents target/pdfs || die
-	cp \
-		"${DISTDIR}"/PDFBOX-1031-1.pdf \
-		"${DISTDIR}"/PDFBOX-1031-2.pdf \
-		"${DISTDIR}"/PDFBOX-1065-1.pdf \
-		"${DISTDIR}"/PDFBOX-1065-2.pdf \
-		"${DISTDIR}"/PDFBOX-1100-1.pdf \
-		"${DISTDIR}"/PDFBOX-1100-2.pdf \
-		"${DISTDIR}"/PDFBOX-3656.pdf \
-		"${DISTDIR}"/PDFBOX-3682.pdf \
-		"${DISTDIR}"/PDFBOX-3940-079977.pdf \
-		"${DISTDIR}"/PDFBOX-3785-202097.pdf \
-		"${DISTDIR}"/PDFBOX-3947-670064.pdf \
-		"${DISTDIR}"/PDFBOX-3948-EUWO6SQS5TM4VGOMRD3FLXZHU35V2CP2.pdf \
-		"${DISTDIR}"/PDFBOX-3949-MKFYUGZWS3OPXLLVU2Z4LWCTVA5WNOGF.pdf \
-		"${DISTDIR}"/PDFBOX-3950-23EGDHXSBBYQLKYOKGZUOVYVNE675PRD.pdf \
-		"${DISTDIR}"/PDFBOX-3951-FIHUZWDDL2VGPOE34N6YHWSIGSH5LVGZ.pdf \
-		"${DISTDIR}"/PDFBOX-3964-c687766d68ac766be3f02aaec5e0d713_2.pdf \
-		"${DISTDIR}"/PDFBOX-3977-63NGFQRI44HQNPIPEJH5W2TBM6DJZWMI.pdf \
-		"${DISTDIR}"/PDFBOX-3999-GeneralForbearance.pdf \
-		"${DISTDIR}"/PDFBOX-4197.pdf \
-		"${DISTDIR}"/PDFBOX-4308.pdf \
-		"${DISTDIR}"/PDFBOX-4408.pdf \
-		"${DISTDIR}"/PDFBOX-4418-000314.pdf \
-		"${DISTDIR}"/PDFBOX-4418-000671.pdf \
-		"${DISTDIR}"/PDFBOX-4423-000746.pdf \
-		"${DISTDIR}"/PDFBOX-4517-cryptfilter.pdf \
-		"${DISTDIR}"/PDFBOX-4750.pdf \
-		"${DISTDIR}"/PDFBOX-4153-WXMDXCYRWFDCMOSFQJ5OAJIAFXYRZ5OA.pdf \
-		"${DISTDIR}"/PDFBOX-4490.pdf \
-		"${DISTDIR}"/PDFBOX-3208-L33MUTT2SVCWGCS6UIYL5TH3PNPXHIS6.pdf \
-		"${DISTDIR}"/PDFBOX-3783-72GLBIGUC6LB46ELZFBARRJTLN4RBSQM.pdf \
-		"${DISTDIR}"/PDFBOX-4338.pdf \
-		"${DISTDIR}"/PDFBOX-4339.pdf \
-		"${DISTDIR}"/genko_oc_shiryo1.pdf \
-		"target/pdfs" || die
-
-	mkdir target/fonts || die
-	cp "${DISTDIR}"/n019003l.pfb "target/fonts" || die
-	unzip "${DISTDIR}"/ipag00303.zip -d "target/fonts" || die
-	unzip "${DISTDIR}"/ipagp00303.zip -d "target/fonts" || die
-
-	mkdir target/imgs || die
-	cp \
-		"${DISTDIR}"/PDFBOX-5196-lotus.jpg \
-		"${DISTDIR}"/PDFBOX-4184-032163.jpg \
-		"${DISTDIR}"/PDFBOX-4184-16bit.png \
-		"target/imgs" || die
-
-	java-pkg-simple_src_test
-	rm -r target/test-classes || die # avoid to run previous tests again
-
-	if use tools; then
-		find tools/src/test/ -type f -exec sed -i 's:src/test/resources:tools/src/test/resources:' {} + || die
-		JAVA_TEST_SRC_DIR="tools/src/test/java"
-		JAVA_TEST_RESOURCE_DIRS="tools/src/test/resources"
-		java-pkg-simple_src_test
-	fi
-}
-
-src_install() {
-	# https://bugs.gentoo.org/789582
-	default
-
-	java-pkg_dojar "pdfbox.jar"
-	java-pkg_dojar "pdfbox-debugger.jar"
-	if use tools; then
-		java-pkg_dojar "pdfbox-tools.jar"
-		java-pkg_dolauncher ${PN} --main org.apache.pdfbox.tools.PDFBox
-	fi
-
-	if use doc; then
-		java-pkg_dojavadoc target/api
-	fi
-
-	if use source; then
-		java-pkg_dosrc "${S}/pdfbox" "${S}/debugger" "${S}/tools"
-	fi
-}
--- a/dev-java/pdfbox/pdfbox-2.0.26.ebuild
+++ b/dev-java/pdfbox/pdfbox-2.0.26.ebuild
@ -60,7 +60,7 @@ SRC_URI="mirror://apache/${PN}/${PV}/${P}-src.zip

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="+tools"

 PROPERTIES="test_network"
--- a/dev-java/sbt/sbt-0.13.18-r1.ebuild
+++ b/dev-java/sbt/sbt-0.13.18-r1.ebuild
@ -20,7 +20,7 @@ SRC_URI="
 		https://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/${L_PN}/${PV}/${L_PN}.jar -> ${L_P}.jar
 	)
 	binary? (
-		https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz
+		https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz
 	)"
 LICENSE="BSD"
 SLOT="0"
@ -43,7 +43,7 @@ RESTRICT="test"
 # Note: to bump sbt, some things to try are:
 # 1. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-ivy2-deps.tar.xz
 # https://dev.gentoo.org/~gienah/snapshots/${P}-sbt-deps.tar.xz and
-# binary? ( https://dev.gentoo.org/~gienah/files/dist/${P}-gentoo-binary.tar.xz )
+# binary? ( https://dev.gentoo.org/~gienah/distfiles/${P}-gentoo-binary.tar.xz )
 # from SRC_URI
 # 2. Comment the sbt publishLocal line in src_compile.
 # 3. try:
--- a/dev-java/xmpbox/Manifest
+++ b/dev-java/xmpbox/Manifest
@ -1,2 +1 @@
-DIST pdfbox-2.0.24-src.zip 15651754 BLAKE2B 5d0220c28c2be18a66aa66c2540d3e1d85ecc6826f632e6c9a0193f2f02dca645909b0a54c707d856bb2886d52b0b5fb706503b4f89f0eb7aede8e612bebfa8e SHA512 5d55b3cadbbae266d90c47f5b10c9b09b6dc16f53b77a0cf15c78e62fc69afc7b6eab5a4329608ecdf25de9194b38db1f7d23e7d71af473cc1bf7b09b0028642
 DIST pdfbox-2.0.26-src.zip 15766524 BLAKE2B eafedf1db5a54d36cb42111b736ad79adfcc106630fa4b2bc57873dcfbdbbb7bd0e9408611b0d8771909e719813e388430944ae0fbaf800bdc859595de2b101b SHA512 e14c57e28d10324dbcb6ad239bad5751a2dab0035bbd80427afd03f65467ec1376ddd7d08e7cefd4d950b149f85d8f505f6f50cc3093fd65bb8a2cbb2b8c7c1e
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST vspec-1.9.2.tar.gz 28882 BLAKE2B 016b91e2eb9ef5b6d8ebf563ddd620ce9e57dc4a9d013a67b3d5cf644325c49f02aaef8b3a114b6802494ca026989ff56ab1f0cb5e398f6cc9eb91fee96797ea SHA512 0c453743f73cfc5990fcb7222cc6fc1b96b93b15b4ef701562f84ae8ef2961c0e2e256f32a400218518463b932a3efdba33e3ca0b418f3ac6969ab38aeaf348c`