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

2 years ago · 796ec59b8c
parent 98095ea39a
commit 796ec59b8c
8608 changed files with 30994 additions and 51146 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29596 BLAKE2B 00bea017e08e7c6af2ff9d5d989279c2fa1692abd76a595694f47dfe5b35d065a660739f2019694195ac20e61e6066ce9cdcf7f262b0d9aeb97db350b52365ca SHA512 d335336e077c3a073102307a4fb09df0ce284f2548938c14551e1d68849d4fad0d2be5d055751aa4d0b75d63a56d4ed915b7224d258cb3a594be2bbcdee1b6df
-TIMESTAMP 2022-06-21T17:09:32Z
+MANIFEST Manifest.files.gz 29592 BLAKE2B 6e91188a7c99e09f86bfa48bb9cdf9141cc83575b63450f0b750ff9e3021b0a631aa6b9d67fda7e47602a5d71823d44161948c304da2cf696f3cbfa77fc3a132 SHA512 193c12d690586b1996897eb995c832fc54232f3b3a90fe98e1cdd568a27b4dfc350d1fd41fa396b04d2c61861f17c8a8b7a3e166add910689d860cfa5e915824
+TIMESTAMP 2022-06-23T07:09:38Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmKx+0xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmK0EbJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBo2Q//S4Wu4l4pRaTjK+JfCfCO5MkmO51uEpsjnd3yj2bpDf4k5k/cLYg47eRO
-QvO+yHGXHQf7GuCC1vV8yTHZ7dFh8PhfWt+pZhltR8LQU/wlLN3WTNeI0Lz0Kzrj
-Xdz1shTm8X4SeEGkBJkPG85bbSU3BslqgokNkRAKy6ehOFn8KBLEz4xInh9abi9E
-qsJJe6R2UzPokRgkuJp5Xkn4tGRAFVTpYHVCZ5EwTOcAExTTLGaydY2XuzTAYflL
-H5Rsb5GDsySjnZ8ZPjLAeYPsXeWlxUQDUxmwVrhhD/3Hg+rM3K/n7LY2LetmD30X
-cU1Kp5fBiNtiruE1FcTB69Ha41KjJqeCZH8BQwUFXgmrloH8Cig0Qjdh1xpgsK0U
-g4nA7c142tMRL974Od21IaKCNS+B/HyP4ivV4fze/iS+JSd0Yqre/IqUoF3xTU01
-XVWSlyEjriv5r6ZMdku18JwQ4lYSzWy4uHXpKFOm8lWJ6e8FxcQCtP9P3BMmHCzK
-iWS8O//nr9WptJK/Y1a8WyJWxyd2Zcw4evwvuCGozgANfUGKsuzUsT9HGrv1aPCj
-Lw9Kq1cYsFK8QOBiRMPsmnh+3DhLsfFBDKNyAGnJdt2Ccx5Xof7u2CSfBOFBn9Np
-c/vigY/MWysVUfewoKKXDaTO517LOL9LOo+Ex1JBtTDgi1HjKl8=
-=4LQx
+klAZCA/+KcTb3o1MmwVY8FAJGdtT0vz9RFS8P5Tff12zAPPhg26VgWpZGNWfUC6e
+moqjuPWIA1l1HmpmQrQoRsBEMOWY9H9eXSFDriNIwvbfEQivc/qUyRkdNYVRFHda
+uGQu2iPCn01FYB9vCuKDE3MNoK7kKzkC5HPh9uH63Q1gvLPUkh08u87PF+4rhHgH
+ilTZAGtoJSkM475ygcM+I2lIkJQJXSSR1lohnBqQy4tbU7utzTx1e8v1AZRTKIAS
+LuM0B1gLsK4upaR11jCcZ3ZSSAHN2cfHvObCCDa/dNmstnSUUrY8xoGimhtnAnsP
+MqvkWADMImhF3GRSXf0BDZwyp7K+jBnem1NFzy1DpzO7B2tkbZfJBkdf3SxqTYkQ
+w6mYOQWexC8Pv2XuYiZO4spMEgmJU4XLl8c2jJxErIs26WylQCT0QY143pOvlO7p
+Dq9tSfsucrbDukW8Q7JkGfPCOF4lA6FMqKCyNV6def0bPQcfBfTG8i8i90JEMACy
+71gwX3iYGjdImeFZvo4R36++LOedMXGVKHECrTEtcJuQxPEql55ShbhodDas6fbe
+yhQb/MsmlpHTxYxJj9mOQfFcaUrGseqIkqBDRn53cPWpNs0sK8Lw2/+Lz3RONYy/
+bFdEdaISZFe2MnpHcnp4cGiPKw9j4tQgNbG/gieGO7PBqHrTILE=
+=5As/
 -----END PGP SIGNATURE-----
--- 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,10 +1,14 @@
 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
 EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
 EBUILD ansible-base-2.12.5.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.12.6.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
+EBUILD ansible-base-2.12.7.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
 EBUILD ansible-base-2.13.0.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
+EBUILD ansible-base-2.13.1.ebuild 1652 BLAKE2B 4d62ebd585cd7226ce888c7042bb256b3bde16d22af4b61a25004c0a68fb21fea5f1d781e1e779de93a767263b01e33d78d1c73c57c1c85517f46dce4a5c5e57 SHA512 1654e03cade0cdf01b8294590e4bcb589a019d031b3f5278f05945e87a0b2dcca5c5000873de5ddba870230380085d95fe1a017be8649b725ffb0ce5e2db9975
 EBUILD ansible-base-9999.ebuild 1652 BLAKE2B 790486ad0a49351a7c12ad6ed3661bf16503423edaa8fb7e128dd8cdb06c1dc4c19aa3e538faf16e51c244e83ab000d33f2892dd97b6f53a8d49d4a0a1a15dc7 SHA512 d4fde99d65fc48702f6def192b0c8bd042fe19659e98a0cca4c3f4567b5f8f86cdd12d81ec62dfd9f828c03ac71bdc6e42adec695fe0175b37f420a47c35abab
 MISC metadata.xml 1040 BLAKE2B c516a3b141924ad21424220f2a9df134d428156283f00f01a6c953ef837bef941fff9f345b48aae23a4af29c938d5053f6147d2e7c43b24af16c1c68b79b9d5b SHA512 6e99c597f3d16d8a5173da3334639e0beed6c95235082b152a3ca256de4a10907c083a646d69152fad23816ac2fb81d0f8d3188fe1713f4030a638cd225e3f61
--- 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,7 +1,11 @@
 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
 EBUILD ansible-4.6.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548
 EBUILD ansible-5.7.0.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
 EBUILD ansible-5.7.1.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
+EBUILD ansible-5.9.0.ebuild 705 BLAKE2B 3aff5e97267d1d1bfeb1c51ea3c1bf6602434de0695fb7da8c995146e626fb4c817c6a86bedd5328ac25665ed511668408af652d54c25b50e4b9f55090960ae8 SHA512 3adcec18ad42c9d3edbad2ef586ea45eb15216072eb6ad9a90ec0aeed6c5001e73f43a73b0cb74138e0eb2481485a01440ceae22ec666f4cd97d5bcd067e3ca4
+EBUILD ansible-6.0.0.ebuild 705 BLAKE2B 09a68de4d26fef9b7bae56b435b64aed0c28ba9ee5c45aa56e2a9b314124b9fb14af0b6d3c9acb6a986c07902aed68a7ea93e092f1b862e61d00cec1ce13c1fb SHA512 23566e58957aaf63da622a5cf7b92c4f289910710c0d2a326993e90011e31245665a4d26787fea38a5f298c0ec4064f4d4594e0986ea404e765b95b267ff1279
 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3
--- 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,7 +1,9 @@
 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
 EBUILD awscli-1.25.12.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.13.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
+EBUILD awscli-1.25.14.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
 EBUILD awscli-1.25.7.ebuild 1811 BLAKE2B c35b439798c718974574befd5d1bd327aec0c8f3747e7de256d735738975d5e90ec0eb05fc97258bbffdfbc9c337f700cda71fed90383ac0bbad0661c8ecf8d3 SHA512 2821cefd21e2d9860ae0a87fa8ef4b5f50a24649b0a319af10e890155f11af13f75be1dd18729a800153e8d0a4610baf2c8d33b91c89b889843983e0599d39cc
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
--- 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
@ -4,14 +4,7 @@ AUX master-confd-1 188 BLAKE2B 8ac416a7ff64c73556f07a08268ea7d91547e242becd345ac
 AUX master-initd-5 558 BLAKE2B 09a1485449b239b4f0d7e0514572084769c73b28053fc6ff9b4cbeb239358e7311784c15e883ddf5ca8310794e3d2bb851f2a765bb3aa17f8081ee008bfd130a SHA512 36b2d601d4dd3bd7b1758e77029b70916adbf8919c3ef04fd867ca25b143666d0c2f5834adddf05e7c2b013f04939f57e3396c888514e08f1679e6459a6ce7bb
 AUX minion-confd-1 188 BLAKE2B ad20094c30f9aa573397d347f9fb11acafba2f724b6c836d7ec57f10d4182c300a4b0ec572b5f3301174febdfc69c30752c3b0eabdfdf9f4963b03531db23523 SHA512 0051e13351cef8db81dc075a194bb384723f07d5591b5b4d3f3adf4180afaf7beced470ab79ceca9d1ec0dae62dbd72084eb76af009fc78411a011050a94a2ed
 AUX minion-initd-5 564 BLAKE2B 19f2d909b1a91b5cf22c932b04b794ef536c3a84fbd36676d4bf136c6af66ae4ea94abcf9657919cb4cf85ee88cc6e93df0e7373e0410823550cc45ebc8f5673 SHA512 c92165fe73157c9c3898f7c8c90e3b1626f704d4a8432237bd264463c66ba00e89a1d66e44b049703fd32ce48f771248b902e7183c4e31ee6611f938704b2583
-AUX salt-2017.7.0-dont-realpath-tmpdir.patch 834 BLAKE2B e70496f3ab18b954e7cacd29dbdee6ccbe0a07f139903360312db247926867a78513cd9022f492ce370eeafcc81bc4db545359036f8f5b0d2d64d3c5bb8aefc0 SHA512 33b69954e8112c0f76654d507df74a4cdd37e8227848f2ce0652b3ecee8b847253ccad33cada0e3dd1471c54c780dcc12d5e546c4ec43868511b95b0c7f71e17
 AUX salt-2019.2.0-skip-tests-that-oom-machine.patch 739 BLAKE2B c0e1b18c528ddcdc19e93061112d2c42aeca96f9091218e7ad6b4eadf11255079cecd6b9b9def576c663b4ba794d151db8fc32336b1c29c3da8e9c18c09582f3 SHA512 0bd8fc2ab73be8ffc9fdda65a60c7306dbfa9f76d874994ba09db7ef71678fca80c8fde5963d22b5bbbe3b933140a56f2173f4c109b47dd9e9c3c9a70062b0e3
-AUX salt-2019.2.8-ansible-roster-fix.patch 572 BLAKE2B c11106be76626673a0e6365dea7ac8593f420ffa2bc0ca02c24520240d863d69a7f0449f10b5d53f6292c247f434636a0f188338ffa3d81a27abc8db18059c92 SHA512 86a2fc107882855ef60b2722e7282de8e6ad57c5fe6809ff99843f934a193445da599d57d1cbc3d7d3443f93d52a7ba5922c6bd76579f85648f6256ce7a81c66
-AUX salt-3000.1-tests.patch 2390 BLAKE2B f46b8a4aa2c57307385d6e56b54b54ebeb18bfa298b66804a64c7e64608fb07a8fea8eabeebb8ba1772936cf50541d6bea81eefcf9617ccb8074b534ac0ec1af SHA512 5e3a212995f8f4fae4e3c4c51519fd2e7bfa20b39492485e10788b3cf72ff9344681fdff4a2d6364e7e4b9c9554fd3efffb9d197aad445423950ce72c6455b2b
-AUX salt-3000.2-py38-abc.patch 2641 BLAKE2B 054fae62aee23528beaad9e4c9c8ac72c1f9a208e2b5d2d17af08ef0e810e7b2ba93522c110bf052a4d3d8831aa772eb3ab7fcb378034634a4b46f10af5c5c20 SHA512 b4feaa17cdbbb9cdf4ec7759b9fa201d731680939e199edd2e683ca6dc5b2cf99aa6fa8f87517dfbd5b6af2ccafbdb50cf9744345149131941f1bd107145cf69
-AUX salt-3000.2-py38-logwarn.patch 4875 BLAKE2B f0ced7bad98983296561d223405d512077c0b70de12a8af613d4069842d3cb6167dd0da49c30fc881e985594f755ce0b063df311bbe84ae9cfc37896670aca52 SHA512 94ca1f73cbeb9d3ab93cb1c7afd4abce5318022a267342e4b348066c5508016891a3c05bd0ea867ae868794684bdc1bfd3e7779c4ea2a9cd60626d6513f8ba4e
-AUX salt-3000.2-py38.patch 1739 BLAKE2B 49591845a247f3e9fc092229950518b6ccb10035bc961a6193358a4be5b84b1e3d6fae69a5763b85966b1e115e8cf38378e2e88c66c3e10699ef47587aa3e7d7 SHA512 4a537c0e45c3287ddc71b91637b4b7f1d54e0dd4e524e91f39cabad08dda14ce5d2467c1f87bc81a098c36f0da1312b8e627189e0574d0ccecab064cba19acb9
-AUX salt-3000.2-tests.patch 587 BLAKE2B 5eb647ffd159bc56ce823c80fb384e7cd33e79c46baa3e607a772c6de1e8019c53908a2eb5111dd770b638c8088b76bee6c17f8cea9e17f3f7b8d3ab93568839 SHA512 ef6c1cd995a03d49ac2aaf65b516f0dc1ac9764e32392c67febdfd31d23ca178bb4f29a903b4d67f8792fe0fb903c03596cbfd1c1223e993189de890aa41b0c3
 AUX salt-3000.9-tests.patch 542 BLAKE2B 9e7d04564c89549799ca92c1e8f9790e0a0f800fff1ebe02ad3fb54cb7f88075fa870b655caca2fa657cac5db02817fb23d4be55b42216e585cb3df5f7ccd320 SHA512 edd4676ff1fbf7cf72fde72cd0ba9317d4976a78b8cf58cbaeeb5c0ce18654356c6e1acdb3b34735822174098c910dfaee2dfea35647ef6e56e0ab56ebd35efa
 AUX salt-3001.1-tests.patch 7149 BLAKE2B 3e5de0decdec9bc2ed1a6fcf2dd04c0c554f2b11a8bda45a797e811a332782eec9303ee8c81aca4f2fe646c392c63f151c0af6a3ef18db370914a2aa06afc485 SHA512 661f2ef797b1b338e43c33af80fbad0e2af9b22439b3bdf0ad6fda0b632961426a787dbf8e592c5a9b73c84af3a466c128eff15a519b83af2e9a74e0216ea014
 AUX salt-3001.6-tests.patch 766 BLAKE2B 979c29a00fe1d67529b204c1ce74ef8a94ed070bb17bca5404e1b8324c7e792493007056741b6fb7f519b4363c0c2191dae40eec97621457aaedac60990a9455 SHA512 b1fedcffdec0b3ee2e1195445944cad605c1558a4023f7836e23dc97b9b6adf105b6ad0ea526b93ae07a6b1917a0a355dd8d826ad87f95f0427de4a2a2153ee6
@ -39,9 +32,6 @@ AUX salt-minion.service 162 BLAKE2B 6f7b6b72e26d1651dbcb324b1e0cfef9f4b5a794f405
 AUX salt-syndic.service 169 BLAKE2B 0d00f20b4663804eaa4b6a1a1b32ed87b04d1f4df6a8e8e0b2a0e3d17f71e1bb53f71f6168446aaf3765692cd540217c4cdf5ab8dd9cb7032801aa798d8a9bc3 SHA512 b45509a22a18f573726a868fda1591eaf42ef44220960dda698274ba8ff1db8cdc302605133ab61b188e15017ba15c5f409f3ee64e026b635ac359eea7aad7d0
 AUX syndic-confd-1 188 BLAKE2B 98f13eb627963d65df26140f348c04eb8c253d444d36ecd1f5ef344ad89901b0a5ed62c64364e90595c2d2ee2766f30802a4a86a2555bbea343ab410292359af SHA512 35fe9bf4732c8a53b47099ffe5f9468d884ec3e2671451a6d52821dde6c70c63176b29ade0d700b99aaf47557f58179f780422843346bd3aa6513d9465ec9f58
 AUX syndic-initd-5 558 BLAKE2B 5e1ea25b57f56ad7bfb8be0c845e7da9f99af03c50c31ca2031e604267c680555d0d8a3ef6299ec588770f26dad19d262c8b9403391b60fb17c6811d7946107a SHA512 6e927925cf1e4d0f901bec10499a8ecf1193b99742cfda5f94f70d0ec743902b1b89728cb2e447b8b4879a9417d0d482b813161968dc9c2b2c7944b3af14df14
-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
@ -49,8 +39,6 @@ DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b619
 DIST salt-3003.4.tar.gz 16031515 BLAKE2B 34902aba7ab64f4ddbacbad1b776b9b2218caf22fb843879a80bd5c30b6c28f4c22a050bbaf0e9735507a78c887f52bcae7d1833ffeb51a543ec22fda79252e6 SHA512 35419fbb3f9a0f3e87579f740b717d6902cab0d85397b16d1e94d9516bf5f5d269b4f8bca370fd376abd9b7c8a6ad7ef4c8e8a8fdd31655fd17c810989e79693
 DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
 DIST salt-3004.1.tar.gz 17685649 BLAKE2B 64950cdc8420228f935d4a21fc20872da9ecf7c51b866ec3c59b46486b84a739b002acc44fa909eed93ce3dc6bedc9804df05d3d9ee5a9a13cd9d041ba70f876 SHA512 9353a8dc2a1c6e272318c6f35059236c5d78b6c8930f715275b701c12fca3be1fe930eb533f3f0c22933ba60967b0980300b922fe486cee9a62e6cdb568bdf91
-EBUILD salt-3000.8-r1.ebuild 6621 BLAKE2B 07886dd10693134d3e01db34e6847f96272d3510854e1b8130c999ae1fd026bce5024cd6d311a8a69eb60ee8a0cc39284aba640162ecb0ca22058e1e21810a7f SHA512 d044a41745e400cfc7d9d976ff78b736ef3c630e9df89502eef78867e57a628d78f032366e0e4d68d63856d453cf13e034597c1f6b3a30279f5edc89dc781d37
-EBUILD salt-3000.9-r1.ebuild 6663 BLAKE2B 257266c6734f4c859234e73e654bb2ce8c685c4509b1d49e4e60b4f6e0cc3b08be0aa9be70746f1f114d498e00d25111753e5297a63e71d3b39bfe7c7173f1b1 SHA512 b892b57e2aecbd6e521c3f6973c0e75e037b1a310ddfb1c1c107512adbdb108c4e9e47a1d8542734883fe74e6e951aed051abe35e7401d6ed70e6abd23f9f11f
 EBUILD salt-3001.8.ebuild 6233 BLAKE2B eda71511e995977e91fdd0a1b323a47fad5a6ab9b2969ca696f410066d859db205c12ca7ce00154a562b83e8542c5445cb27e8ac72f33bf4615b2fb234899496 SHA512 790c10e9770a8b859cb6e721e962d0e992f2bf3d0d11db2fbe2811b7f4c122218b317f64172d3a65175d62511db5906f1d3873a98336d726d089493796defef0
 EBUILD salt-3002.7.ebuild 6506 BLAKE2B 225e4b18c276e26f7d9dffb06920f6ad7990b9b7de7c3e838325c8582e6408ce483e284e03b549dd62b87beb778c2742c12e14e6f65e89c890cdab912e138525 SHA512 0b06ca50fe3f0b943a7270f617e61eb4d73fb0a3187068d37495987ee267f53e499abd638a88c098bbcf07ea51ff46f2ed9ba7c0717069239b81cfbfa82ac92e
 EBUILD salt-3002.8.ebuild 6672 BLAKE2B 81dd96a7806afdaa396d39658697573c1a902d27d4b6adc5dd1ff0a73b88b18ef61e2845b965128003cc2161c490748b0e37a5e0fad9479c2da69069043d3985 SHA512 c7300e77e23fb0c30780733b5c98ed7f239db2cdc2b757dc0980077407c21b6183f391ed5f7c4699aea0044757fb0b13adbb01ee9d9eba5f5467d20c96c29fe1
--- 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,7 +2,10 @@ 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
 EBUILD sudo-1.9.10-r1.ebuild 6976 BLAKE2B 8319a74c6c4cd73c1c45b2d28c5275fa1d6438a67a198541c9202f1081c9d0d7a53b87e4669ac48e6d3cf1ebfff5c4b06e14bbe08854166e4f9205e784ca441c SHA512 239152e2442735957d4d11e35a28a738a8a84024f4453202dc2465c59da46561642d98927ddb0c4ea9b879688605e6fe3d94b9c05399d42157002d2a6be5e488
 EBUILD sudo-1.9.11_p2.ebuild 7386 BLAKE2B ccae805ca97cc7470605997171bd5d9a292a2dd094b78ba834b34cc0c1c608b228f66c3c5329641532fda23e5dd32f867363fd1edc5106bd7a04d01c3947929b SHA512 d5596e4c9e7e2ad5af160575c0daf27573a6704830f46add107eaab1a7002a36ac364ee758fb976db3ed74a88b5f910f25107225b050eb72c5282300cdc58b94
+EBUILD sudo-1.9.11_p3.ebuild 7386 BLAKE2B ccae805ca97cc7470605997171bd5d9a292a2dd094b78ba834b34cc0c1c608b228f66c3c5329641532fda23e5dd32f867363fd1edc5106bd7a04d01c3947929b SHA512 d5596e4c9e7e2ad5af160575c0daf27573a6704830f46add107eaab1a7002a36ac364ee758fb976db3ed74a88b5f910f25107225b050eb72c5282300cdc58b94
 EBUILD sudo-9999.ebuild 7386 BLAKE2B ccae805ca97cc7470605997171bd5d9a292a2dd094b78ba834b34cc0c1c608b228f66c3c5329641532fda23e5dd32f867363fd1edc5106bd7a04d01c3947929b SHA512 d5596e4c9e7e2ad5af160575c0daf27573a6704830f46add107eaab1a7002a36ac364ee758fb976db3ed74a88b5f910f25107225b050eb72c5282300cdc58b94
 MISC metadata.xml 1050 BLAKE2B 4027c8a5941e8e12bb6c9cd9950187965b01e236ddfc073ba0dd98be8e3e98225ffbca1c05b3153d72e5507484f966e01c7b44e9416bbedecd88ae8f4d52e359 SHA512 8033bd4649190c3c6bf0d07dab2dc99a708b81a74b0d154b1f4d56bdfbc115d4889b3a78e6b2f3eebaa91bf0252e8fd043bf2bc850b8f6b4199b38ea751b7174
--- 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,7 +1,7 @@
-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
-EBUILD bzip3-1.1.1-r1.ebuild 768 BLAKE2B 7165efac61206050bdbf4974ffe0220b9814b65fb1979cd8631fb59f44967857751a04e225f2aadece56e43df97d94816a9822b6760aedb730618cfcdf6a7652 SHA512 56b2bd84a97d60624116096829927f65d35f463ba7e3a955916a6996adbf18d3dad4bc297e5bc466fdffc2a033c8a680a6eaaed2c8ff345a0dbbb23bfb3c3b3c
+DIST bzip3-1.1.4.tar.xz 260404 BLAKE2B ddd087b631c9d5945dea0f4da280dfd74fd303eaed10f7553f770ca18b3b65f00718c073d87e565602a9ed02f4604a0d2dda0ff42cbd38f593bb012f5362cc5c SHA512 86f26b290001d255ad1d2378b5e2d59f9c85e1625ba5d7dca86acd544bb80af95b3379c215a03e0f81f77b7972a852d37746c1028464f404d28a6f9b707383b8
 EBUILD bzip3-1.1.2-r1.ebuild 768 BLAKE2B 7165efac61206050bdbf4974ffe0220b9814b65fb1979cd8631fb59f44967857751a04e225f2aadece56e43df97d94816a9822b6760aedb730618cfcdf6a7652 SHA512 56b2bd84a97d60624116096829927f65d35f463ba7e3a955916a6996adbf18d3dad4bc297e5bc466fdffc2a033c8a680a6eaaed2c8ff345a0dbbb23bfb3c3b3c
 EBUILD bzip3-1.1.3-r1.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
+EBUILD bzip3-1.1.4.ebuild 782 BLAKE2B 63fd29cc68cd7caa2e8108efbcfd7061d15dfbd5adab63c13c2214650fd6f443d4be06f7baa0f9c723b48eb9562976cfb8aa0c646784dfa3561d8374419959b6 SHA512 9183d00e40f9750cc71dc3d8b15e0fdea75122e2e32911c04cdfbdaf4b8b5ebfaa47c6d6ca2d2ab779a0c52d9221794f1353a6c980b5be2c81ed74d8a0d0ca58
 MISC metadata.xml 879 BLAKE2B eacb925ae4939be72ae25f0f333d8c8e1c08b2fd7946e27dfadd214b8fd5f27eef3f141f9ca911cf89151245f2fa11c7a8c5459c63badbfaf71e62aaca6d67f4 SHA512 963eae34b110b883993959f97a84c5fbaae914e009d024379d8b83ad02b335f3d7404ecd9020e291a38e78cb358dd4d0ff1b4b8f3604a2cc719e9d82ebee1e50
--- 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,8 +1,6 @@
 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
 EBUILD borgbackup-1.1.17-r1.ebuild 938 BLAKE2B 9e1165ef693d028e2936f22ba5bf0af42bbd7a83d1df32f667bd79269cea3d39ee90cbfe9b9718d8e650cb0ab33d6de5d909a78274897ca1ebefd918538db2eb SHA512 04fdb94a90a9a0bc36de20029c03d73625bae7f1ae099f96ce225e778cc60a00e60fea2ebe5cb40b35c2fb8af46fd0cade56a359e2a2d9eeef99e5581c560dd0
-EBUILD borgbackup-1.2.0.ebuild 1026 BLAKE2B 1743235df1ccecc8d0cbc13b53e83f42f390402a0faf1e38dafa3ef909ec94581d63ea7259e544ac05d590dc7b9c6b4522bea8c6b8889e03549d98444d5b0fe1 SHA512 49717a5443b67e2f864cb71a1dc1c8110030ab72690ea2377a2e4d4bfbca9f523c780c23c2dc0091acb44f1ea4d9467e6e76dcb7e7d395207ca1e1ae0165d07c
-EBUILD borgbackup-1.2.1-r1.ebuild 1036 BLAKE2B 95ceaa2892b30cdd47dfef94622046167b630d40764f370c629dca689b29fc12ee3913a5823f726fb626d01705c91642c58ad5230565fcdefe42f36ad7adf1de SHA512 a05b4e824d397e4c5b662f56cb34a32d3b99c233a224f2cfab587a5e36500110f66bd4dbdee8a11fd304b3c60290d38b3844da7ae16792f6e8325bc10bb3ad41
-EBUILD borgbackup-9999.ebuild 1026 BLAKE2B 1743235df1ccecc8d0cbc13b53e83f42f390402a0faf1e38dafa3ef909ec94581d63ea7259e544ac05d590dc7b9c6b4522bea8c6b8889e03549d98444d5b0fe1 SHA512 49717a5443b67e2f864cb71a1dc1c8110030ab72690ea2377a2e4d4bfbca9f523c780c23c2dc0091acb44f1ea4d9467e6e76dcb7e7d395207ca1e1ae0165d07c
+EBUILD borgbackup-1.2.1-r2.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
+EBUILD borgbackup-9999.ebuild 1126 BLAKE2B 4762c677facc18c89d9830108dd12c993099dd510000e3fb9466a79ef2c443e47709fe4ea8c3b3c6f6db111fc682df641cdcf260843dd7a7a9052eeea2e836ad SHA512 112347bef1052ebc52b0b26359050d11ccdc6a82f2b674f54429552e08e3d6fb30e0c935835c28f662aa469bb8b82e5823b01ff4b1ba270492a3c1e77543325f
 MISC metadata.xml 494 BLAKE2B 885fa002bca2ba16e31bc66dde9d21aea8eb5a3ab5522cab3e824a9cde1d87f8819eb028eb21a9382d23622fe0a699a481e7cb7cd50fba897e59490ba0734d39 SHA512 bddc0ca7934315439e4a23b43fbd42d538c1570b43b0401efa9641c2854e5633d727db4bda82a34fe88ad2c1b512df47b6654b50f85a0501f0ef8405d7f8a667
--- 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/Manifest
+++ b/app-backup/deja-dup/Manifest
@ -2,4 +2,4 @@ DIST deja-dup-42.7.tar.bz2 1384797 BLAKE2B f462df835039606b721d935e086e51ee27e86
 DIST deja-dup-42.8.tar.bz2 1467818 BLAKE2B 6f02fc458890f076bf0a8e1ffdc9d72880fd9f1a692d439ecfa5d8b08234472f3ae27aa801144b3e42e9c8b67b550c0882dc93c23d27e6e428ce1eddd80a912d SHA512 76c98e8635ffae076008efa73a92860c6d4e67d39339d452c253269bb3ed032b819ac40d65c2d8fbf195ecaf304796f516e861b0552be972838f95bf59af0a5c
 EBUILD deja-dup-42.7-r1.ebuild 1060 BLAKE2B 6a6e1700456d62f20d3d4f3c381120b76c0a0f8b4878f0136769a6ae28383e0a915c10ec0c347fb878857963cc9cef53aaba6dc1488aef420976a139a4991f24 SHA512 a794d26fa59f326bb2b0e81a46102943f73a67c7fb1a2fa462b087a717189208cb9c3f558f1298feafb9230de1aa07f029410c490e1454fda734658734d9ed0a
 EBUILD deja-dup-42.8.ebuild 1071 BLAKE2B 0e1dfcbb7fe88940bbc1d8993af6da3dacdd52cc3ca75ff3b29480bf5db1837ab10e2e5436be687cb8cc010c8f5010892e03554b3b966032c1d56958ba6b3bf9 SHA512 802a7b4a207c6aa21fdb2d62cda0afd9e4c7a7c25b45e6294a881a76e6aa7b9c1c9393e5ecf1726535a132b927a030adaa76d799987bda06685c2824b55efab5
-MISC metadata.xml 1197 BLAKE2B b35d1ddd33fabcb87afbd41dd6116a51b8443af892c7836f8371b42697950ceaf4561b9cf644ab8924be29d1753fc4e749665cc64f0baae8a45c81b32197d92e SHA512 ffbda2f78255a0bcb32a702f4cce208822d737b3ebd7d36186ed98b8a8a481e246904ccddbeac283f95ba983dc2ba585c77540355d86d76babafb9b139f2ca3d
+MISC metadata.xml 1118 BLAKE2B e56ff39a4eb5290c056fbf39b8c34d56c62b63cd65c317786b9e2a14f0c850edc3102db7908e106a9b94c642f8a34dcbbead2fe08e20f8a44fac16a3dfc3afee SHA512 1b2b8c04079a2c6d08c14722b235ef106c4711156ed147b9ace5da0aa29cec362903adb27d13835e32cfb955b688428dffc2593ce7e4202e93233b879c07dd6e
--- 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/Manifest
+++ b/app-crypt/adcli/Manifest
@ -2,4 +2,4 @@ AUX adcli-0.9.1-glibc-2.34-resolv.patch 1160 BLAKE2B d32a1b3a02558a17c60b8804c9b
 AUX adcli-0.9.1-library-include-endian.h-for-le32toh.patch 586 BLAKE2B c48b0dede264e9eb26038ef6c80480229d93d6cde351f0c1fc951ea1efc77d0a18da4d045e01953e99b8ff5280c4081fd2f9a4425c289a4ff01a1e207dc79804 SHA512 8aec26b0f21ddebcf2529ae9e4052c38150d06fe5f4a95f1f011e0af5ae0781b58d40a9b3515178f1986f465ea076516ec1dc9fa81c451fdcc7dd5fe4a9cc85e
 DIST adcli-0.9.1.tar.bz2 89684 BLAKE2B deaf6d3a13ad29c77a35b9f9c195dd646f384ad7c9782c15b50b26efceabae268bbb287d488ec7ed8d783d92ce7d8399f05898d30201d0d7fab7c0369c22fce1 SHA512 7e41fb51bfcb8837f9e5f6fd1fceacece0762c237dbc0f58dd581e2be8841d7a613d57507aea4534a66a2bd10ef4d01c4e04885437038c71238739db6e357d6e
 EBUILD adcli-0.9.1-r2.ebuild 795 BLAKE2B f00333f24261cd5628e358c0dc597b02f8fdb25274c4770332628bf57c71f296f68fbb26381756f229bbe43f8fee040cdf41864e73be2679b807a2f9c2938d36 SHA512 fab4109877430cfb7233cde305d083ca013b4d128c69ac8dc6cb6ebbf484da4906acff3fcda1447718397386c4b8cf617ce8848897109d1cfe9dd05071b21e68
-MISC metadata.xml 520 BLAKE2B 3f1f09ab8b0ed9bd3fb649665b738a959c04108ed58448f0b9dacd8b1c59a1e6955ac66911094bb81603710ffd35b27e72be2cace91b105e4d9c3a1ea2f8f14e SHA512 bda03c0f3d92e46e7b48657dbd2cdceb9158236dbe2c0ddca280f84787b15737ce4a50112d48c38c2f11efbe42b3585f77d4838611903734a479d6f0fa761c82
+MISC metadata.xml 408 BLAKE2B ca526749c82fcd9214e0800e78fb5a15aac9a18fec9b62c92905b363bae37977242f147fab1763cf36f172314e072ac14a04f4e294e65972430451a74737561b SHA512 50b2b3a820ca02719e74d730220bdab838f0d00e2abaf1c64479cf6af493301d4fbbe71183c28fc717e604aa1c9fca36efc67e6045b35c3ff1473916538fe4a6
--- 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/Manifest
+++ b/app-doc/doxygen/Manifest
@ -14,6 +14,6 @@ DIST doxygen-1.9.4.src.tar.gz 5196383 BLAKE2B 8fe27a8821e3309aa0314586b569a7e295
 EBUILD doxygen-1.9.1.ebuild 3069 BLAKE2B 04a668ae2be27712efc937e69f67c6d2f33041a91ffcf3d6f64255fc67c477619e56cf1caecaa02030422af8cba57b0e828afd6858fae5e4c5dde7ee44596c43 SHA512 adbefc8067347781614369199c02d7071e0fd19b047b1315300310fdffbb84781252e860382b22aec58aa881bc0a5f0f2599ee342dbdaa3d674697689cd6ae11
 EBUILD doxygen-1.9.2.ebuild 3044 BLAKE2B 418674cda835cb849d96c670af9846778f8ac40727af6ccc6a1c3880504be23dcf41007f18900cf7e4ab4ed1aef4057718aed61c83ffd43571f99fc7a844457e SHA512 af9d3a74eab861a0423ebf852b94312597624ab156e849d30cfeecd4cc20c8a5eacb6daf8da48dc21f7579b3c4c86754fcf28ba5856882616b7330386e69a729
 EBUILD doxygen-1.9.3.ebuild 2905 BLAKE2B 6c177c1de038266e02c18912f63d087c292447346b7e850d4b17f30a7eaf6f3f66703502afd8afc4eb587d2c99374e343e64c3ad587bc6faceaab29c92275352 SHA512 1d25fb469253a97006fe043ceb225704d1d9413277ac644e7c9bdecd8309f1564b2b6ffd6c5a999e3529ef4bbc5bf5da9f08dede72643112ebb984b42f94a90f
-EBUILD doxygen-1.9.4.ebuild 2944 BLAKE2B 54937fe6bb1eff0ef51af557774dca93355494de9465c122f40e54d7f86e27c322e8fa6f5058b62f475d792752ffeb1ce45b0559af9d2e14d06aa3b9d6adefb5 SHA512 77d691b3de275a248ea0d3ded38bdd2d2385e4edbeb69d894ba29517501a8226e2952c91814df4e110d51268e5c5fb71bd6e30869f640da18f082e1150e71f0b
-EBUILD doxygen-9999.ebuild 2962 BLAKE2B 22e62feeb7aeae0fa6a4f649f5eae8ce2a24f62b909b83a0fececc22eb009b211635b2d6744f449a15b70d4d9d4e760ddf685d905786d855e13c842bace4ab8f SHA512 9c6f5809ea8fba07dbe97be7288f015ca9b3e116d5023659d8f2195b10820d864716d1bcee877bb5c127458538ad3289601a55965223bca53e9c61050eb5ead7
+EBUILD doxygen-1.9.4.ebuild 2968 BLAKE2B 88e3f17036a670fc2114821b1007d4914c8f28e780047a5734356f3e8f6902207c4e86037639a172b9467476466a969b922aee26ce86e3b2662a24919bd00a9c SHA512 75890747b795067cc5ee293978fbed4c80b3a98a8dcad7368e068edf4bbc84e4ac9cd64cc4fa4839029894a92ccf4e2436a336c16d06938df865e76676ac21a9
+EBUILD doxygen-9999.ebuild 2986 BLAKE2B 8071c7994a2475019011f01e3d71cdd93b5e570587a8dd0cb68bc2e6741a86b1a543c09c37bd1189732750ff8f8b5ae958039250c1eacb32593cf84e9ed346c3 SHA512 57d69f97e3748337e298f82a0f9cf18aff521e43869f6d4301ea9d2191d835157395ada7807331630ee2004b54e24d4c1eae03f1fb57a784f859321295b3750b
 MISC metadata.xml 972 BLAKE2B 21df73118710e6eb9b1b495aef2b87b5c1457d55efb50bd3051d72505a12ee9855407f9222094fae21501f51d8ca97b70a211cd0953a68d172fc030b64144def SHA512 0d4855b1b4233da690add845a04c089c8a71634b25bc1dea8f995997b8e329e0e882eaaea15cc30994f9c063df48ff49a865c372162c4eb3dbc08bd6a44a3b67
--- 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,5 +1,5 @@
 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
 EBUILD kicad-doc-5.1.12.ebuild 1433 BLAKE2B 61ab869971082533455fdaed043c899d3e06057c646587ad1913f81f50827e1cbaf10cf7ee7554b01dc26c5af2e0039b55515b9f4c69ad0801ac9ac820a1651d SHA512 ee92e2d045ce6174617369bd37b3390c6292b0688f779bc01b37ccc5f368ff9dfb2780695c700a054e80f5ab401f174b601371fbd0048de597863845d85e5f3f
-EBUILD kicad-doc-6.0.5.ebuild 1952 BLAKE2B 969b242a5958ebf769bfa97af3efade6f75b836d6ae0865e33b5ec374efea582bac93f99e2f3251dee62688d0d97f1054919c3a7b08e32431829cd8c2a54ad94 SHA512 b45d9c3400cfddfeae471750e9d2cfd2b2ceb6ea1595277ec8f76e9e806f927714e9bbae079cfbc222eb3a5806283159b07ac4331e31b2ae1683316a00119b55
+EBUILD kicad-doc-6.0.6.ebuild 1952 BLAKE2B 969b242a5958ebf769bfa97af3efade6f75b836d6ae0865e33b5ec374efea582bac93f99e2f3251dee62688d0d97f1054919c3a7b08e32431829cd8c2a54ad94 SHA512 b45d9c3400cfddfeae471750e9d2cfd2b2ceb6ea1595277ec8f76e9e806f927714e9bbae079cfbc222eb3a5806283159b07ac4331e31b2ae1683316a00119b55
 MISC metadata.xml 852 BLAKE2B 9b21d1f5ae47786e87fdf3703b2e65645cbc4746b861f023f8ca94a9d32dd8c50594eec0e316538943abe7f93a261b3fb2e96f1ac56bccbc316e2f9ef06cfb77 SHA512 aed642bd4c57be8cdae2dc31c81db0915b30032b72dbce3ea157163e2713bd3fe6812aa96c3ee3894f84cfa9126577fb69c2da35525eee2124728c004b436fad
--- 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/Manifest
+++ b/app-editors/okteta/Manifest
@ -3,5 +3,5 @@ DIST okteta-0.26.8.tar.xz 980328 BLAKE2B f8cdc9246c24c922f3f5b7dd659d3d00c3db586
 DIST okteta-0.26.9.tar.xz 990484 BLAKE2B 97430ed8a5c8dda422dfd43a91c04fe778581caf475c74b324a26d772777030d73ed799dafa6662b225258ae76c1c37bd38c7d3c97d89d28928106d10f84308a SHA512 cc98f7923a26de9548944ebc207284879607707f41065c847707ac5876c04d31926bb4edf82062cd4d6ade2df64d7a2363d8dfa711524574514ca0dd260b4a9f
 EBUILD okteta-0.26.7.ebuild 1759 BLAKE2B ee45723b1bc86ddacfb559b3dd178a7563e62e83150a1e3f61cabed62a34116744e4032ab6068653ccc0bb78c60262a3644d08c1e932afc82446cb15b1b1a9e5 SHA512 0843bdc737ed5a9bd214e49395b5468c7ae37230db3fd733d774d309722f778df7cd51b94f887544de083e53c50cdc697cbd7bc39ba660c4326eae6ae910a05c
 EBUILD okteta-0.26.8.ebuild 1762 BLAKE2B c5dd1eb6329f206be08bacea292fd3ff2b12da6a1dbfb8674c0cfb4117ee3bb299358fce6c6cba6a54a5b817594851678f5fdfb2fe7ce9b7fd529e47ea6e3cd3 SHA512 443435661b95a9604d6f0a78bc5922774db888a43038180a1c1373001d38a337fd6ea2fa54dfbccc8d3bb6957d327ab06568875471e72d8f6192d2de26337da5
-EBUILD okteta-0.26.9.ebuild 1762 BLAKE2B c5dd1eb6329f206be08bacea292fd3ff2b12da6a1dbfb8674c0cfb4117ee3bb299358fce6c6cba6a54a5b817594851678f5fdfb2fe7ce9b7fd529e47ea6e3cd3 SHA512 443435661b95a9604d6f0a78bc5922774db888a43038180a1c1373001d38a337fd6ea2fa54dfbccc8d3bb6957d327ab06568875471e72d8f6192d2de26337da5
+EBUILD okteta-0.26.9.ebuild 1760 BLAKE2B 2cb53768fe567cef703a5edd46d8031bb795e88b3ca30e362ae69a6f468449141ce189b7ac1704b4a6bcbbb816925058edd3ff40e912b437f88d51ba305fe435 SHA512 0efcc5f9b6b29d85e321b36d4f6f79f48bee9667f6a07ad502a3084f260f522907575f4b9608b590e7d9c00ae0dcf8aec9163e3e7faa8fc1d88715601d0383e3
 MISC metadata.xml 409 BLAKE2B efa27a2a8769a56200077d2d606e930a14fe7b8dad531386da39675c501ea7298939b6c197b668379430840b002c0a5ff34da592fcb2af18734649cb5d527f6c SHA512 0966b96a06e7315574724c75c6c3c680b6ea7da71278885ae65d214ca6a18a4b2d11b101221caa89ef5682d91f7a4cc7c2108f9741072cb12f97e95af0bcb09b
--- 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/Manifest
+++ b/app-emacs/compat/Manifest
@ -1,5 +1,5 @@
 DIST compat-28.1.1.1.tar.gz 71771 BLAKE2B 48feaada7e32f07b425048f8b993b2936450dbed8ba20e0f6319d4b098bcc8007323416bf300221a00fb13ff152698c2beaeea6e743d46b1d32b9c0a016a895c SHA512 e733836934671cb373f70a92a20084622e160f2731c5e5c6ce9df348820261db399da0e78d6b95293d9b6992469e96298e9fe83e331a4caaa377fc6ce61f7040
 DIST compat-28.1.1.3.tar.gz 72597 BLAKE2B 82186713370fed7f97eb057cb330d77c1d758224ad37c0b7fbbd21221b0d2ffd68be805483f3e9577866f02079c83a5686918c87a1ed7c67c9acdd64aa3a560b SHA512 d65e5ce666607cd6d26cf771d6878caeb6641aff0fc924ec901955c1a03b6fe42e3527220448fa92a8d6c3f5bd65e6f915ed4ada1be01a29d7919f916826e48f
 EBUILD compat-28.1.1.1-r1.ebuild 480 BLAKE2B e0577d26c6c6724d8a7b631ef2856903ac2459657152fed6855eb769bb41834c948227a8a9ac8f0db2ce8911731817683646aae44ba9512fbd7ec520a0f0937b SHA512 718c6a0290929acf3487b6b824d59609fc3f7f4c9b5bd6d25c99f957a2de0412a73d47d86f483e09fae7ccb5486b3e0a287b999ee8fabceb892042ddab9c336b
-EBUILD compat-28.1.1.3.ebuild 529 BLAKE2B 199c85aa58b17398bf29941874ad04f3e950926e67f4c830eac5d51bf6240a6ef65f13c3cd7feac3f7ff9778a0b8773fee59e6eb3bb9478418987d808a544d96 SHA512 277b2d6d84012afc7a7223b283f208bbcca55b8855558f1b8a03ca3aa08f15f940fa3272786ca2444f25e26f4cdeae2fdf2003e90833ca1c21113a936331d438
+EBUILD compat-28.1.1.3.ebuild 996 BLAKE2B 659a6059db70cab8bd9e29255fe7b8ed207dd31e9e1d4858374dc0152f61bb318732d2bd4446dfa7ed25b126ef0b02b3e32c3c70438b86ca06ba8b88d88d0c06 SHA512 a7e0c0d0e24438e548d46cfb7f34f76772afe8dd41dbf4997db5d0026ba5ffd27cf097cd0e7901e80d730860e61afb55f14b17264cc5de41ab04a90bc8643dfa
 MISC metadata.xml 293 BLAKE2B 07085bc46a57a9592b46c4442f0ca6995a5d1857ce51bb85384d389114b3385b71f3977cfed5d7180fd574cc4211824a327c98f5f690a9d959320f9d960af88a SHA512 c3af1c6afe14f621f3d1689ea4fda1b7215c3dd9e3c578e45edda24cc4eae1ec11dc29d42d87c762f3c6decf9f9bdf356b109736d47951c9eaefcca8d9111d56
--- 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/Manifest
+++ b/app-emulation/wine-gecko/Manifest
@ -3,4 +3,4 @@ DIST wine-gecko-2.47.2-x86.tar.xz 45556880 BLAKE2B 43334edd68f22e21347a49bcd7321
 DIST wine-gecko-2.47.2-x86_64.msi 55354880 BLAKE2B c234602e29a6597d26e7a78ec85ac66471ecd8fcea5360d6f32323e4cbee4aca2ccd5530706e8779346ff2d08f1c4900fef198763e431ce7cd232ef117933336 SHA512 9bbaf061d5d2035e6df0898a847697bbed071abaf95ccde08b5ace7a2c6fc871db16443596b23a889def82f98591973fe8ca88063021d8779f8faa48973f239c
 DIST wine-gecko-2.47.2-x86_64.tar.xz 43025348 BLAKE2B 0c956043d7a49cdd88a3af4b25191087fd638a68b958e13a46bbf4310ecf7cdeb973eb3ea5b254f2d4f90f2a715d35c25a67b1883159a60a0ff6eea70e0f1077 SHA512 cf7af1087823188c3be6665d7662bf1029c58b4b8db271e5f4bfed15df217b905653b034b62ed0fa961f528be40f0325b378669d27c9a18ef5b9d98ef8c63aeb
 EBUILD wine-gecko-2.47.2.ebuild 1027 BLAKE2B f9148675665fa0e6d0f4f8e00a58b282ad489ee4bbd8ca9ee6aad69d2dbd7b096f3bb39e16acbd3254bac1b2775f68d00b4a2e66c0725707d62c63824e906c85 SHA512 ea1371d7805c0ffa6c68f5030549ce051cc4cd2f000eebf193f371f8bc5174d76b09c10ec9fc59f50b0cd032c51d0f3ae8464e8df4cca385b498d6f0127c059d
-MISC metadata.xml 546 BLAKE2B 1f49e7caabbcdaf350245f0f861ccfd43dc6103af458f45fd26b2773aab50dcd7a9d2b79af8b4e8109a54b632bb654e5576302beb40dc252bc850c4e609f09c0 SHA512 e8b060f0254fbfa93dee20b0b5dcd03070d2b8eb757114ec2783de37cea42f8ceb7c7978cfd024543677b3d269d15b3b1fb5348b14d3c6726eb1e4a06b0f42b9
+MISC metadata.xml 434 BLAKE2B a825bbdeb70a3e8b86a167a2902a5b5a7dbe7d7268bab4452e4d61699dc3449bf2441cba42baa321d4e86d83f16ffffa7597acf82664da4d822b6f14a407a55b SHA512 56b110d425e78e375897bf4adafbe785fe9fe7181181e3e74a317365afb43e391df36e75a673e994c4ad5eae990c8f8f7045302be5e7cecc8a35bf87a569c872
--- 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,4 +1,4 @@
 AUX tccd.initd 673 BLAKE2B 418e8a473ca8592c7de313a4a18a71172555ed3a79cb7c5f22dca8932883ae0190c091d0585773d3a5ceec6637611740744fdaa4542b00edecbc04e00a39eab0 SHA512 d08f4e4b11e9a1b62c5694fba862cd6fc223e2461a93272fd7085daf7f7942cf15dad0f9370257d19f9252e2d38c82c15de4d311cc037326edf6dc4f05e2bebd
-DIST tuxedo-control-center_1.1.0.rpm 71893232 BLAKE2B f41702ba7faae2375e95a0bfe838dace738eb9f34364bac78bba405ca791c0b055ff7c7a05572172b04ec1acd87dad7e3abc29df06bba84296a8bc4c76d5d9c5 SHA512 3b98f27ada98ff77d0fc84425042dc63431fcd169ba28f5a0585589846e8dca1405a9d258bdf90f86d0e363a827bafa80e58c8dd56e94042e3b0f0d726737e05
-EBUILD tuxedo-control-center-bin-1.1.0-r2.ebuild 2146 BLAKE2B 62e0cbb0360947d02a7dce758b0ab4099e7e38616ac674a9a11429ac1c797439a2b3ba916c84a014ab69836f856fedd8328e38ddb7fff2cf312c53030a18a2a1 SHA512 89a2dbd2f032553d284ae021422ce3e13faedda7ce8e4939324c78b42bc79c09a9ca76de89d026bf250ffe1b67b35d5a8f7c0ca19e343a321919ea6b2ca97a25
+DIST tuxedo-control-center_1.1.4.rpm 86231740 BLAKE2B be8b7d7c6de05601acd90a89b3e6bb89c5e251a94a18c7f1021e88797fbc1fc9c580545ca3d86e1ebf11f689d2454d4b6eac1736be0a31eabf28668d0ca0b32c SHA512 80e0c0f8ba81b8fe7bee2ec86b13a5f50c2a174b4260b7922a58df821a0b2ae89cd40c87e41c48de0a9e24a56ec1ad5123a664fc94123b95c05e61801db67072
+EBUILD tuxedo-control-center-bin-1.1.4.ebuild 2162 BLAKE2B e0b4af01b6da75980c3185378eb1ab1e578a33959a8a19653bbfe1b323cffb2ef2840a6ada6e1a606867c6687dc8971201ffb32e8804485005350683a3f958f2 SHA512 dbf06066a22d1f5898a3c09157bd295434e0fac73aae68c9151b3790d730a67e638ac30701f9213d914c4783dd3c01e1254b2d1eeb58b9f0111caf805110cb2f
 MISC metadata.xml 251 BLAKE2B c4b2c58fbe476fa27226d01a46b74c9506d938c1e14fe68ccbee1383f683d357ff87a3c1aacee177b7f3908333cd58540e446bc73ed8258359481c4b507c155e SHA512 f113d652bc4a2cded17c6fc788d425f8a5d1fac17709b4f0583c7d530cbba5093c4309d2539d169f733d8e8bff3c0e71e24ffe4ba6a81ebd5bab23191c0e4278
--- 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,5 +1,3 @@
-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
-EBUILD tuxedo-keyboard-2.0.5-r1.ebuild 583 BLAKE2B 3633ae11af2f13a533feb53f2a3368ddc2b1a6a536903ecfe4312850d64b00f7f2ae1d81e12358515035e4bebbfe02640954602e7ae2898a7203f02d4f64c31d SHA512 eb48c301ebded725bb576736e611d8a187a0f9c9778cb272f6f1c881b108ea7b306e650f8822f78f9f5597b88344a55d80a6d9897b0cc305e54d558e5cf9914e
-EBUILD tuxedo-keyboard-3.0.8.ebuild 675 BLAKE2B 6aa6f7b4d2f6803f59fb21a927061d20473906accc20c58fcd752bb69261eb0ba91f14b46c7a4bc7e4dc0421e20620f8681b521e590d0ccdac4ff2eee2c59db8 SHA512 dadf0006d0c2740030fafc6379be6faafffef9ca845412cd3d99a36d4142c7565f9c4f6096ea6cf8731dda80c6b98ab3ff164cce891a481f1bb1ebc73ed1c28e
+DIST tuxedo-keyboard-3.0.10.tar.gz 50759 BLAKE2B 08fec486f6555ff5b8de6b1ea49ce504747238284fda31b05686fd5955bf3bb3fc48b49c40b50c1bbdfcbf4af2f206a99f645b294ebceafec4c87751fd460090 SHA512 a3c5b74fc5587763f131a66f507c0b33d462ed87c8e05391152c09d1425b5e1771bfb08cc2d1e3bb73b02074f503d866ea463fd44fb06d00b38c6ac4cfcd4e3b
+EBUILD tuxedo-keyboard-3.0.10.ebuild 699 BLAKE2B 43a60c7b4ef5d0f19de6504eb319efda50b2ce8007633d0f968c0aff1b748e538b3f48cb26f2462aecbbca552a82b0abd63a582545b462b8a9e734df08e731d5 SHA512 0be648314f9042881a55109862e97a176de2bc68320706d310b6cf00e9f47f2c4bbe835962ab89a1c73b7e9bd16fe2b11e10596bc32deea45977c9ad5670fdf7
 MISC metadata.xml 257 BLAKE2B 65c73e9c8dcc3e61188ef911f456b2ae23c9f2a0a207c7e3075566177dd9ea14b0b2da755fe8b864552179ebc17ff35a12a824c1eae0d52d3ecacf2a5aacf438 SHA512 89f76751a66c20c3d723ab5eb4a547baae7aa155ed5cc0e82c9c78ce6a26a8b51a2025c25b3a2df8e0b67b41e5c7479b8d162111fbd2f0949adecdeb44b5a750
--- 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,6 +4,10 @@ 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
 EBUILD pwsh-bin-7.2.1-r1.ebuild 1227 BLAKE2B 29c0376487f8de5e230861642f6b28ed0e4ac8e5ef59bbfb47a7eae6a5a3802fd582fe9b4f51ce7222229ea06920bb7007505cfecd76dd7129b213e3cdd3ad7a SHA512 498d4f8c364f814f938634e4985b147b7e49474906aa79d21f69e61ad5e3e5ecdbdf595bed91be7610410a43bb1b742b407f913807f8b74ff55621d2f3a76685
 EBUILD pwsh-bin-7.2.4.ebuild 1227 BLAKE2B 29c0376487f8de5e230861642f6b28ed0e4ac8e5ef59bbfb47a7eae6a5a3802fd582fe9b4f51ce7222229ea06920bb7007505cfecd76dd7129b213e3cdd3ad7a SHA512 498d4f8c364f814f938634e4985b147b7e49474906aa79d21f69e61ad5e3e5ecdbdf595bed91be7610410a43bb1b742b407f913807f8b74ff55621d2f3a76685
+EBUILD pwsh-bin-7.2.5.ebuild 1227 BLAKE2B 29c0376487f8de5e230861642f6b28ed0e4ac8e5ef59bbfb47a7eae6a5a3802fd582fe9b4f51ce7222229ea06920bb7007505cfecd76dd7129b213e3cdd3ad7a SHA512 498d4f8c364f814f938634e4985b147b7e49474906aa79d21f69e61ad5e3e5ecdbdf595bed91be7610410a43bb1b742b407f913807f8b74ff55621d2f3a76685
 MISC metadata.xml 1063 BLAKE2B 8e530950e9fd2ef015c90c3aa0ac2d0f3601f9a8018c66654fb6cf50db24f7da81eea995d01da55ed86ab97801ce6e45d144eb74b35718d55aaf8fefd249fa47 SHA512 b103877bec5fedf20ade237226711dac26d8841fddc4aec8e475f29bd997c42518fb696a2ae8e93937ff708f86e5d47ea307b48598bf7402b3dd8f88f7b95d37
--- 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/Manifest
+++ b/app-text/calibre/Manifest
@ -11,5 +11,5 @@ DIST calibre-5.43.0.tar.xz 38641220 BLAKE2B dddf9e5f7303845f8d86826d38d08dfbf05f
 DIST calibre-5.44.0.tar.xz 41015696 BLAKE2B c7053e728da20fccfa981ed4f56e24a4d5b382b7687c92ecb039b078fd4828de0529380093e4ab33f77d78aa54a59758c1620cf8f918937a9a64f13decdf77ee SHA512 3d79e76d820cd1a41605dfd4c1d992599a6e4a759e57a8383d42d86982177e4539313f59e647758ab1896ce5874cb2a93c7678bf962e332c44171651aabf0230
 EBUILD calibre-5.16.1-r1.ebuild 8236 BLAKE2B cf912f26258d5637807dcb51f3b14e2a871dcf4270048ca317eede91a3ec3a7e637f30c245bfbe5b5d7d03ceec9ec8736b805f4fdcbd71566a1ab112aace6712 SHA512 30d7bcab56ee9e45cf3237104afff8f4731a12c8867cd58b56d88e1e6c55d8fffae2af0d95247949652676add6978e1ee6bcfbc193a645f9027fb55024ac6cc7
 EBUILD calibre-5.43.0.ebuild 10138 BLAKE2B 871ee44a07e438c66e4a9199be27cbcc483b819ad9b75978bbe5c12b2128654ddca647820e550e0337ad511b4a37eef7f12bcb5c0a25834053102273bd3eaa8f SHA512 38ab0238eaf88d8b213102495c55773f03f2022b5eddf18d31e2c15dcb91397f879124159705f0fe014d7b057721050d7546ed9e4c7c2212360a03466932026b
-EBUILD calibre-5.44.0.ebuild 10140 BLAKE2B 81bda1adce186b12c2153514f363817721896e675a4889a87dec703c9391122217c4b43f31f2f4ac00fb0869c4ba8f1694200e379cca46d2b8aebf05ea44f042 SHA512 45cc8fe31d08e07bcff3591bc880255efa99cd660be87bff3ea695094206f4dd570adeeddd0f2bc5a6860ff465dbe07fb24424bc53aecc07ddea4e628e2c3ff7
+EBUILD calibre-5.44.0-r1.ebuild 10149 BLAKE2B e888a90ff66bda53f9a516ff1a1fd250ec1ea84e346fbeea3a66674d7b55978028784f10fac988a90f4587e496ffd5402cc7594e3fb0637dcaf8947a354fd0ba SHA512 1e3c0983cfd384172ba10a97f361a52f197ac6dc053c7049f90901212dc552ba840d15fe995023fa5f85fd5e8c0679a6c99c813ab06786df0c1b6bce16eaccc5
 MISC metadata.xml 304 BLAKE2B 0d93b1c7606c37cb8b7308b507a1d2988a05f780a93ae80c98e021f5af75128954d57b102afc1d96728872c81bf0adc40e32b31197dfa825cd040af3a8739fb7 SHA512 e193c0b78ed4140b695c44d273310207c9f2f745bf31589c69e81230a9eed68fa1c361c1e3f68a60e135ef0628aa480002229871f4a50f4000aea6df7e5f067d
--- 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/Manifest
+++ b/app-text/xapian-omega/Manifest
@ -3,5 +3,5 @@ DIST xapian-omega-1.4.18.tar.xz 549892 BLAKE2B 440f7ac93acca5803c80d905a90db854f
 DIST xapian-omega-1.4.19.tar.xz 553680 BLAKE2B 1008376d2ba6d72d3cc267ee3bda78a1d37491d706417010e0f4ca7dddf78ddd3d9ad07108874eabfffd0280016ce1fad49c86ee89eed9b37ae571586f838c9b SHA512 82b682bc9d244256afffc2ab1b12b0f577184296a979dc42b2865b689c6d46eca6b838b95a5d040dc228de0c2e2261e81279e0a748eaff2d018732ce4bc07fae
 EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
 EBUILD xapian-omega-1.4.18.ebuild 1163 BLAKE2B dae372708867c009c83bc637ad3e1bcab78ebd8337890eae447236367109096f1bdb96e70ac9ed80b0b09adb37358d763d2db08f5aff37576b810f23f7429a52 SHA512 dfa45c4f78539ea8f1e485f3c0381645f44c95cf9ff10df293d8b1244b0a3b64b865c98fb5323db6594389e1550ec3338b711de9eb67198f854a57d7bac0ed0f
-EBUILD xapian-omega-1.4.19.ebuild 1189 BLAKE2B 903109b97d7bdf608a4919f51e4ebe983dd91ee1f147a340dd522206f4e10ce0b232888a8b2b166f08ce38e94297e480015e19cc5e2e939d98f5cc8ae5146673 SHA512 eea182953545f5d24fdb6d09f2c8084c6ebc3eb9fa1f57e55ccfade81efd15a2df5850eac475531cc7f99673ab683e3cfba9b418f19055faeb38933ea76f7156
+EBUILD xapian-omega-1.4.19.ebuild 1187 BLAKE2B a4dad1212801b2136e81c3d87d092524fed757bcf06d14af1621a96aa17889fb195ac889295ec0efad7a0252c0fd9da42be512a97892ae12bdf1bff87f4ef979 SHA512 871a6bfce082318a97cf4a17bdca552fcd5fd1d3f051367d6a489a868a18472422d549d1ccda4dbf61459aee9cc95c5fbcfe0e98037b8ebdde702b5b7a08d3da
 MISC metadata.xml 253 BLAKE2B abd5250029676d23201d38d764a87f155a72fdb12c27eb98faea12eb441fd986c1cf2f230265e7e7d257e5dcc81b6710ec90ebf8dbc3a6597a04c4fff95eb771 SHA512 96c2922337805fd36723b0f847b2b15365e7207a21d57f6c6ab7e3cf8ca089b781635eaaf3ef01cbe61c34ee8b3f4c1c6234242db390ccc3c3bf0b1ab660b467
--- 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/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@ -4,6 +4,6 @@ DIST zathura-pdf-mupdf-0.3.7.tar.gz 8957 BLAKE2B e25412423ba8ec7c9c96d320129f9a3
 DIST zathura-pdf-mupdf-0.3.8.tar.gz 9198 BLAKE2B b873d3352d4f324d5dfceebe0ca1cd13e5e5b9bbedf89a5fdae553a2d2cf59ece455bbe931fc021310a7be3c765663ef73931016d48abaedaf2d3488f96d0866 SHA512 5742f22fc919af390a8a42f64640c36aaf1499a20d1c6603e70cc47b3f6634dafc94a31bfbb30c88524ac0c18c040f0fd6c63d236dbb556784cb17a9b0446374
 EBUILD zathura-pdf-mupdf-0.3.6.ebuild 802 BLAKE2B 0d21f475acdc3b1db922101a735e23aa981ed6eac5f9998cd9f6c149ffbf4f127a76bff6dd2bb95fc610ad29367f498325de498f259a14ff46a5c8462b9822c5 SHA512 9f9e1d8f6600d6689a8f67d20cfea8a98b2884522e2e213ae48b33b6c229433f2e10cc502b7ee60672ead65ac6385096f812b07318dd4f082faaf7eae8a96c84
 EBUILD zathura-pdf-mupdf-0.3.7-r1.ebuild 770 BLAKE2B b03dbb81d5570940d90c4f91c755a5c95ff9e09b9932a44e8a0edcad2811762f8ddf20d78fa17dafe91d3e7984c9bbe5f0c9b7cb89032f1d6fee4a1dbf42db9a SHA512 3284605db9a02201670e81ce465bd8c3005b4755114ba2e92dfe76fd60242d5cfaa5ce32bc1ed53f90be60213a5ed7e089db4ae98ae6f81380b5d06e4ec8b6d6
-EBUILD zathura-pdf-mupdf-0.3.8-r1.ebuild 782 BLAKE2B d046a164e347d8a9ef6154e6a228b024fdae887d3987ed2999c5d45978ad729a915ded498bcf35dbbca28050d041fe26ca129d01d1f9e90b605c594b29f8dc21 SHA512 89a22d8304286971bd4d2dee58a0dffca9a8134989ac4a5cac643b316f9b3f1758993cb4d235d9328379d0ca79ab033ca77f0f1dc6d60e710f6b883fc888084e
+EBUILD zathura-pdf-mupdf-0.3.8-r2.ebuild 783 BLAKE2B 87ad7d1eadc88026806ec9999bfc3486257362db0b3e0a6546c98f00b32dd89c8a699362c3085e822110fdd4b0645b3b968538917bbafd852eb69bcd49b01e2f SHA512 677fb3b5ced87f54d9d69367cba816f781bc08800f32219dea880e1cb767252401410b67c211908e815e3d54a2d3e7754d16d818439e9291bacbff9a182267a9
 EBUILD zathura-pdf-mupdf-9999.ebuild 800 BLAKE2B 8ba3913b6ba61dbc596710d20d0eac03ff8b9b7e047cb813068967535581ccfce9e090e207c050612e40f349e9ae261cba9946de0b8a1b63ef2df61ef761b8c4 SHA512 67a0f4320d42f8dcebe092ccb71fa3b1e21afd9292d7a7cd549ff6ef7fa79d9a493d61be06996b180787cdcfbd02934685c0ee83f4cf923e7aa3ec302e715bb2
 MISC metadata.xml 827 BLAKE2B 3260695042be5b2fa3df9337f1888467d43d79c210d466c9cad94c12f50400563e3c7a34aaa920d43160835fa90267c39a8266a927c184b60b86ab520a9deafc SHA512 1129c85640589275b1a973de6b5b61cfd1e54a294cb405e9e6b42e6b58bc92e3f82cfded1f6e7e8d49f2d81203f761a871085771c4eb0b2fe11cb1da190b3e5c
--- 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,3 +1,3 @@
-DIST jedi-0.10.0.tar.gz 36820 BLAKE2B a66f7c58564487d83867d61480d83364af0047cee713c41dbd5c67bff0b2ac33d066c2d0f4367c30059f46fb9f4916fc8d2eb9c64aa6a489e2c16a03f56b0b3c SHA512 65482505446b1001e92870ae64a147b38c0bb4d3151e464d325be741729506a191b284a491f4c3eb77dc46cb9bcd6b8e7bf8689ed95107e89a1f6a05c7fbc9ea
-EBUILD jedi-0.10.0.ebuild 833 BLAKE2B 2419296219ee6f21c4572edcd22bd11106478153297098a5e67b885797b28dc5d6f9cb36e33680a527852534c927307577d5c420b134cd2402913c913f408c4e SHA512 8857a9a90b5bb354147f66f8ea0dd5d31622a3436fad9dcb34b06d9b2b8e0a9fd5f43871fd666943bc83209f42fc3841a2d0b5c86ad76a1581551455d54f33bf
+DIST jedi-0.11.0.tar.gz 41606 BLAKE2B 146f60f43a3fc764c66e2ca94c2b4051be3e25b5a94ca3f6d82533b624433946013c7df38e61262e6ac40a00de9d3b9b0e647e794191b6deb8ed09124d2accc7 SHA512 a151fdf4d58adc36dbe9ede8e091ae00c8bd8237b66c512b4addfb6e7e436651848da2b3a0dbcbbef615bcc394e7e28a6e127e53f2205dc61f4d46a2ff0faa12
+EBUILD jedi-0.11.0.ebuild 2045 BLAKE2B bce0951b1aa604bb3fd12b0dcb7eef3ceef6026acdbf45f974299d2296a38fc9540eec2e3473fe9e0e74037ce5f1d77e51f141373889a1096c77cb9d04e4c9bf SHA512 c69e9a46287727325c8acfe92b4b3b6d77c2075382f69b35afbf1a3e5db3aebfdfc76dfc50bac6ecf51c49449c5b7b755734af928b531ed1617f61287c54ddcb
 MISC metadata.xml 766 BLAKE2B d8f5fb163c91e7d140bc7921a21e7e939be641d69abf2c1048dc1bf6b766732dbd431b12f3de3f8ff5dbfefa2260375a811972a605f3c5aa863653a983cfcd59 SHA512 017ca02cb4643b7911bfb472cad02df81075fed0d139af7c818b78b1e972f5641e7def278427647ff294bc4cd5fa430ae2b49b5f92e5a7e783dbad54e1be355d
--- 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,3 @@
+DIST vspec-1.9.2.tar.gz 28882 BLAKE2B 016b91e2eb9ef5b6d8ebf563ddd620ce9e57dc4a9d013a67b3d5cf644325c49f02aaef8b3a114b6802494ca026989ff56ab1f0cb5e398f6cc9eb91fee96797ea SHA512 0c453743f73cfc5990fcb7222cc6fc1b96b93b15b4ef701562f84ae8ef2961c0e2e256f32a400218518463b932a3efdba33e3ca0b418f3ac6969ab38aeaf348c
+EBUILD vspec-1.9.2.ebuild 1192 BLAKE2B 0141225e4b7b393a0885b6583a96b01543fbe692497bc3a58489feffa6717c59ea55228ab7abd89a36b84287eba935e8519b60e5a7b6713f9af0ca4c9081dabe SHA512 477c37d1ce43687aaa406cad54b6e4f33ec1956a90f7e75f3b98fc6e5891cb820be21ef5a717ef6e6ebc2121f8bae8cde478b27a824631fc8306ca6230182448
+MISC metadata.xml 397 BLAKE2B 26d086c79b35cd480bc59bcba74bf3f0df7310fda8150f0933e2dee235a66ee59f8145750a2523f8e84e7cd52065145143afc6296b019b8a2b46b23af1b772b0 SHA512 35626f98c412577f37a9e85f824fbcc2fd57f0b7d6735feb0e6212192641f4fe3f873aeb99243bd5d767e471dde1b5868256d6626574aa74551dd712a641f07a
--- 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/Manifest
+++ b/dev-go/gopls/Manifest
@ -1,4 +1,4 @@
 DIST gopls-0.8.3-deps.tar.xz 22577604 BLAKE2B 762d0eabc16771439fbd0d8cd2018e201a863563b7717def4b4b45307887b7c01db188d9545b43288145b54e969042d5410d53e93b1aac33a3135f8c42eb15f8 SHA512 9816395c6ffa7f13260d88cd72c2a5072a15a75fc1be3d342f80325603b9bd26cd7486be72887561113c4cd8a59d80ae1a5318d1548294a3d57ee04e6efdc385
 DIST gopls-0.8.3.tar.gz 3036967 BLAKE2B feb8ee9dae8eed6ebccddaa8425db20a2e6964af3a537e6cfe9e1bf71dc62a6301516b7114e4e33470f82afa27041bc20c7362a1cd5840da0168ce43bc356023 SHA512 b5be84e3ce79f98f2109ca421cfa913a5031518a068d673b6eec8ec5f61a7bd204ae6e7e11af7f4bf94a6f60107d4268359ed3b2751b3df5a98e685de78147b8
 EBUILD gopls-0.8.3.ebuild 910 BLAKE2B d288d2e2ed305c441e74d300645194d5730b6504b4318326abdb2424658600b3798e7b0ab9ddd5f14543515ccf1df4626494280be04236f09f2281d14897866a SHA512 ffcceba396b2c81eca2d42866591301629f05c7ec4f80d52276b6387342ab4f2cd632b67a4e55911156fd285a0fe9a0ad1057312f907d5c113755d1d02d8358b
-MISC metadata.xml 302 BLAKE2B a30d9b4c902971b5c5bfc2829d863a0265fc1ed2dccb79236676551435e0ff93b69952b4027af0935fc2d97899413e29796fd1ec65f39771a002179df9ec3561 SHA512 fbd5554e0cf4328de643af8416dda4d73fbc68cb1782e8f589376bc5469d63223b5da4a60cb3f7af67a6f5993039a3c85c4160ba1c55d01a49d26e911e8eebb3
+MISC metadata.xml 296 BLAKE2B 648d52b08067cb13811211594b39a985916c22bd5f5fb36d695b790061131622dfc0748429340f3a48e5db927bf7f8ad935cf8884c9453fde5780a396a4ef8df SHA512 3f564045b89d59788d47d3d37d4b0d68dd949c225f27cf6be981b3508b34c796e01df6399f444124c679e1a0c9e6aea36a3eb505680dc0ddf1d39f079d2e0a6d
--- 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/Manifest
+++ b/dev-java/fec/Manifest
@ -4,4 +4,4 @@ AUX fec-1.0.4-remove-concurrent-util-imports.patch 3146 BLAKE2B 8716fcc73a5e1030
 AUX fec-1.0.4-soname.patch 790 BLAKE2B 852ef6ec83d42a15bfb1d67b05364d15c3027a8579d5e90dab4dec4cc99273383d89f5d5174ec8a6e2ab3cb09986d3fd60f39aedec6ae2da3f893325f88756c4 SHA512 1586fc0408274fff7eb3ba2cd95cfac8a94dad9981e2e01e8e11642692d2a27068936b673364c9c2cc70ca848d364648a66c728dc41d85c605a25b7fe79e2ec3
 DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
 EBUILD fec-1.0.4-r4.ebuild 1520 BLAKE2B a1846cba9b90bd18f86adda3de5bf4b68162c97b9c6b103fc19465d51a37f6722a2f39f6478b2dc0e3422ce55eca256afb9d874ba9e5398c531fc823c51bf1e4 SHA512 2d4796ed6269e9e91c36391f237ad3353192c257d24a8219d7b17b98811e150aad49d88a1de169280c2a5f273890e49233d116a1c602d5b99ea0aabf5eebe667
-MISC metadata.xml 435 BLAKE2B f15bf1cf8797a940aef17b1a72884aad2859be1790129554172bbeec7ea0e2f68da81c0e5362cc7d94302bb9090bc1d0960d608335bc1a88168a3607ccb0d191 SHA512 13f1c5f833c69547926d60f4f9325624db5e82ea9b01900b00d48b38079e0cd8b1d038f6a69d784d78fa3cafa6f23e7ce57b78812b91154e0850466c2daf2ab9
+MISC metadata.xml 354 BLAKE2B 4f8e98f361320eebf410ee6724cf73016585ab2736fa9bd55c8e1b0067b231df81cc9112b7e2480de5b07a429b39c97098693e95e2bbc7bf226e74467fc3cbf1 SHA512 57a36f5db74544720c9a899af7720db5f234a1c93967145c3394c466ad4516440702b45db4c4191a57acc4393fb2d7fca2d5d697d563ac67fcd8032dc51e8375
--- 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,8 +3,6 @@ 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
-EBUILD fontbox-2.0.24.ebuild 1762 BLAKE2B 483d3d83508a4db99f14ef171c480b4c06d262a913b967922ab223975636e8176165ae65dc38c01c97e3b1c61264d4bd53d367cb63530eeefd542eea9e4cc851 SHA512 72917eac46cbc8be4636a35dbd2b8ccebe3c9fd271895be79e20a309b8ebef3373974dd5fb6cccf5f4d3c45689274497f4d3997615ece8f2680eb0fcad504e1c
-EBUILD fontbox-2.0.26.ebuild 1963 BLAKE2B b1aeea00d43c41374e070b103991b92a1a1cb361dacdd0b1f2212ecf722d9945fb5108888df7a39dbe5e512296f81ee5194500d4c4bf5665e868ee9e1fe6df5d SHA512 c0ff2aaa71b2586d154694d76eca427c4bc11322a7e68f57c79a16e043dd491129f5ffb2890485e63ff770e9148d5664370d1ec2548abf44b939d668a92135b5
+EBUILD fontbox-2.0.26.ebuild 1959 BLAKE2B aec4115a79052a22fdf2c82604a75c9af57e01aaf10dc4fcb640f9959f8553f68775c25d15ff16a18a907b13765fe4f405e086c99627c72918d05a3b507221de SHA512 e09fdd42a7ef24a11a6714c11717f65e80f5329b4b9073928fbc4cf91f2bbd240ce8959f087e59dd741f8b4d0dcd7cfab8e436ad6fe6100a206f16f65a7d085b
 MISC metadata.xml 571 BLAKE2B 1ffa3f19fb3e5035c5a73503ce6abbeb02de7ea42fb74e21eecb30aa3827085802644b797f197f35d9001d86ec969b0cc6cbdaa634ab0d003fa65bd03c3d09ab SHA512 e1b958bb3eff6c3428581dd3851b8857048e81df192b87ad91fc61d3074a4ebf88dfecf6310ac96a3da6ba6b96d476ef1e258781e36b8f0c5cbf3110d5608f8e
--- 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/Show More
+++ b/Show More