gentoo auto-resync : 29:11:2022 - 13:20:25

18 files changed, 16 insertions, 417 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 480526c0fe4c..237a8e696a47 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index cc73d3241c42..eae8ba98d958 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,19 +1,9 @@
-DIST aws-cli-1.26.5.gh.tar.gz 2294226 BLAKE2B 5c52d77679dcb999626751a7aa9abe3d81a1ee49584ea928ffe7e1fbc8ab33ec02d1385b4fea1d888e4cc11eabce73901389d1fd5fe9d365369f303da09b49c6 SHA512 3c1f6b43bef84060b8d3d7a7d848189e2ec0471e93340a04456f7fe70902722cac59a864db00b9a522ac14fd787ac415403982fd40facbab51a21ef11070b71e
 DIST aws-cli-1.27.11.gh.tar.gz 2303984 BLAKE2B f773a631bd2f172697a013e11765307edfac0957f7bff7d05e74c326239491c03629859b5d7b4ec85a831e28acd47cbbf4a2393c8ae512fbf393142cfb7ca13d SHA512 ad9eee70eb95d2c9c71978425e96b80a42569efca6e20c5caeb6af7b27aa893b3bfe68fed8e13b18e20626c4cd9599e8efe93dacde5bcc5c347b815376819ea5
-DIST aws-cli-1.27.12.gh.tar.gz 2306806 BLAKE2B b94c5ae753754ff66897263883942043fa659cef95b5eb6c4e8edee8249b0cf1010d4490a4a46b477052ad14398f5d034285ff2e21428369b1ab4b425bb75cca SHA512 104cf99cc5bee3261b04a0c11681dfe8a18ffce6d1a4b8502983f6c754cce5b7d7e9b7f1dfd314ff06ccc4d8aa81f47cc335cbdfe81b6e19e7a08bad7cf14b02
-DIST aws-cli-1.27.13.gh.tar.gz 2308435 BLAKE2B 7b9ec88744417d9b3416f85d26100ab7e07a5373ada8aab004ff0411ff1aededfe21376b4843708a7b861bcf0d47fd5182e8423fcb1a041d1f16380532514a3c SHA512 0888cede49de91790dbd8eedf0b9ec96da10c05d06f939ab0cac983ca24c5f4e2dd8d2f3c11e5543c15c04c86f2bfb0fc49f9d29fe42149a2e3c1e2e04266089
-DIST aws-cli-1.27.14.gh.tar.gz 2309344 BLAKE2B dc29dbc89ca963f7dee116b815652c846a643b8415807a32460e86eb9a863470f985bcfcb7f228ce78682b351d14e29234dabc426556f4c7f8863ceec9c55347 SHA512 a97e104c8a45983f52a802d1b1cd55a89f95b1bd3ec5760905404e3f94946c2efe24de70a411d1e943a9ba07671f8114dbb05c216d3d52d1876c05f5e73093cd
-DIST aws-cli-1.27.15.gh.tar.gz 2309456 BLAKE2B 17ef8924b61c578462de2ad1eb8e46d16d55a49cc14ca1fa21fd895fa019bcd22bc2eadea498902fd9d440b2d441902c9a78c2b3687aa3cc636894360bdb74b3 SHA512 2e76d318c88bd344ad5336472d6ef1c8231e61b00cfd52f7051bc272966ea1d374584b0f35984441963f7b0d55d74377c3bb4ce60372751d2f2d00043747da72
 DIST aws-cli-1.27.16.gh.tar.gz 2309698 BLAKE2B b81d5b1dcc8219a977bfc3cfa41053c12ff8cc363bcb8e3afd9b206d69240a7b4f5ef742d2e74cf21f46bc3a36271a516bf15e1ca34272ad64b4b1dc0c67e4e2 SHA512 1570b82cb2e6cbfb14754b539840b12a606c7a81490bb45239c851757b8e3ac694b41c5842a0b0df825d355d6d6182c6fd6b3c3f26e1c7070150814959c52260
-DIST aws-cli-1.27.17.gh.tar.gz 2311030 BLAKE2B d51b0e4279f24e234e09e3401cb3e9a710eb7b6e4295c48eda726c4a3fd3bfba61fe8387106d815d45878fbd897aebafbfa7f8c1035211faefedd4ac057caac7 SHA512 649834169bd1d5069544bccac22ed3ce54eaef839ac0de353127fb8e5a33f72d253e8cfd504aa1bfee06bad82f79a8342defea2178ffe6158dddd4e906497f17
+DIST aws-cli-1.27.18.gh.tar.gz 2313270 BLAKE2B 2f5dc87a2e306d024c03b6cc175736798a28fe5b125aba7e6af9fe1297e44e37fae6990df216cf58c6cdf47ac7b5fc583bed9d5125df063f328544286f4f0f82 SHA512 6f5b0b333af0f842d940cc80f0c18c55feb06c7a4cc609c2db8332126f7e868ccff6f84bfd031bf8d590ca38be9aa258527433e6fab9d63de6a96c64ae740ca2
 DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
-EBUILD awscli-1.26.5.ebuild 1841 BLAKE2B 910c8c2f46db40db315b9551493be5ca63822634b7d69158a4e18bef2594f9b8ea8c7a447441360cbfdd519b346f29a3f26d11626ae571d13a8aaa160015e023 SHA512 059c470a1b01fab20d1303f5f64dc63bbf1ceb2efa7bd9d878ef7d89899852febf599712df83b397407178f55cc1213e9e18f6ba3e50d0e9c7e8c73739039f58
 EBUILD awscli-1.27.11.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
-EBUILD awscli-1.27.12.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
-EBUILD awscli-1.27.13.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
-EBUILD awscli-1.27.14.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
-EBUILD awscli-1.27.15.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.16.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
-EBUILD awscli-1.27.17.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
-EBUILD awscli-1.27.8.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
-MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
+EBUILD awscli-1.27.18.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
+EBUILD awscli-1.27.8.ebuild 2259 BLAKE2B 64d00480a8171f321e7feb58458293b942f7eb6d97b2bdc63f0ed7327d04e56ae15a274df4ce5a49199db2451f336e2ae2e49d20d5b9f57c26a347bc42ba9639 SHA512 cc067d10df0d454b0f7f184d336d98f39ee65dfc847289984f1158c679869852e4820736afc856cbbba1ffa128627778b3c1248897bdde9b799631b5cd24a6d8
+MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.26.5.ebuild b/app-admin/awscli/awscli-1.26.5.ebuild
deleted file mode 100644
index 8c90510a11c4..000000000000
--- a/app-admin/awscli/awscli-1.26.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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..11} )
-
-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 ~riscv 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}]
-	!app-admin/awscli-bin
-"
-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
-}
diff --git a/app-admin/awscli/awscli-1.27.13.ebuild b/app-admin/awscli/awscli-1.27.13.ebuild
deleted file mode 100644
index 9bcb01ac11e2..000000000000
--- a/app-admin/awscli/awscli-1.27.13.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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_{10..11} )
-
-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 ~riscv ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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
-}
diff --git a/app-admin/awscli/awscli-1.27.14.ebuild b/app-admin/awscli/awscli-1.27.14.ebuild
deleted file mode 100644
index 9bcb01ac11e2..000000000000
--- a/app-admin/awscli/awscli-1.27.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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_{10..11} )
-
-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 ~riscv ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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
-}
diff --git a/app-admin/awscli/awscli-1.27.15.ebuild b/app-admin/awscli/awscli-1.27.15.ebuild
deleted file mode 100644
index 9bcb01ac11e2..000000000000
--- a/app-admin/awscli/awscli-1.27.15.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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_{10..11} )
-
-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 ~riscv ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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
-}
diff --git a/app-admin/awscli/awscli-1.27.17.ebuild b/app-admin/awscli/awscli-1.27.17.ebuild
deleted file mode 100644
index 9bcb01ac11e2..000000000000
--- a/app-admin/awscli/awscli-1.27.17.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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_{10..11} )
-
-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 ~riscv ~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}]
-	!app-admin/awscli-bin
-"
-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() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# 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
-}
diff --git a/app-admin/awscli/awscli-1.27.12.ebuild b/app-admin/awscli/awscli-1.27.18.ebuild
index 9bcb01ac11e2..9bcb01ac11e2 100644
--- a/app-admin/awscli/awscli-1.27.12.ebuild
+++ b/app-admin/awscli/awscli-1.27.18.ebuild
diff --git a/app-admin/awscli/awscli-1.27.8.ebuild b/app-admin/awscli/awscli-1.27.8.ebuild
index 9bcb01ac11e2..7f48b14ec3b3 100644
--- a/app-admin/awscli/awscli-1.27.8.ebuild
+++ b/app-admin/awscli/awscli-1.27.8.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/metadata.xml b/app-admin/awscli/metadata.xml
index 16fb00668076..c7866d2a5c1c 100644
--- a/app-admin/awscli/metadata.xml
+++ b/app-admin/awscli/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
+		<remote-id type="github">aws/aws-cli</remote-id>
 		<remote-id type="pypi">awscli</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/helm/Manifest b/app-admin/helm/Manifest
index dcf494f48cb2..c3b03ce785ab 100644
--- a/app-admin/helm/Manifest
+++ b/app-admin/helm/Manifest
@@ -4,7 +4,7 @@ DIST helm-3.9.4-deps.tar.xz 126444776 BLAKE2B b506593f17afcc1c4e70b99eed44c2142c
 DIST k8s-helm-3.10.1.tar.gz 701955 BLAKE2B 869e93ffdedbfd0dc405b287ca6fcd7dc3943f6d51b13c5482a48589235ada7e080aa8d0fcbd3b640e486c90e795bf563a5c6367f4f6116be6357a6cd1052113 SHA512 5d72ef0031b9988ad3d263ed349dd0e1770ccdbeb0e05e057f375a5b6c3bdf5d214f8d7bd004b8500846269e4acdde6f51206d8c422a4a4af7341baa6cdd348e
 DIST k8s-helm-3.8.1.tar.gz 715683 BLAKE2B 2b0fc2a844f848e2a696be54224c1ca6027bf461c0885b3e082b57a09117b6ebc2500b35f1e6ad03cdc7ad4d0f18b3b6c24a1e79782b1b0492effc6a80031a93 SHA512 c4c3c8272ac4d83fad7dcdd41f81e9123ee71b01b6ebf352c3f3836048d7d240e144a52fd78e156c1957020bb1e4a868059486a4a4c3d37e4be150203a1e6158
 DIST k8s-helm-3.9.4.tar.gz 704880 BLAKE2B c96e474ca882fe0b7ba5d9045f04a4e6af62f4d9d3c735f0ae89d03eac06c0c8118ba1b7ffcb7594ad23707c88c7e10d781de4701b8300e124ae767f8917dae1 SHA512 8a02d094744036bcbfeefdd369b2e5e725c0e08cc2891e07aaebf4656fc62030e91ea00b97c1f8ebe33f2e436927d380b24e416509c944468165d35c892bf846
-EBUILD helm-3.10.1.ebuild 978 BLAKE2B d3d36fbcd394736366b66850182274b2f0997547571fa45a58299d275175ed61aa90247a71ce5d6550adb5f21b620c6f68614189cee61483ca83824a1f9cfd3b SHA512 362cd589b088d817de4df455f315e72763381f449fa0d097c79a8d60fb2936ff2c2f956f2cab2e51a30fdf39d6e3037f77bec029fc4b9667ba7a5878805ca4df
-EBUILD helm-3.8.1.ebuild 970 BLAKE2B 75f992b41d1b1680f444d5a73e714fb404276f19ea6f0ec822f8526da7e6a02e27130fbe66c87a059f378794a18d792c3ba6b455f8cc52af58e6d1f5fe9a4b0b SHA512 9642bfa50f7d572ec38def3d3c9d743f2abef929c4bd30bd3c969223e89c1aedf14109ff3ef97a2f7f2ddcf5a906c79d53aed3ce8250149b6f35d017b5e8f17f
-EBUILD helm-3.9.4.ebuild 977 BLAKE2B d4ec967245e4ebeeb53416d381c6eebde244fd785d0201754ec0fd462353885cd601cb4410cec8e608773258adf93f01cf56d46d4e0e550e138b853c08e61cfd SHA512 479a7d0827015d7d23c1c959c78b377d4ddc2d0eb94d105a2a06efee42f19912cbe0e45c322ed3bdf9771defd980b2fea42d3c1ca641cac1ffb5eccac341553d
+EBUILD helm-3.10.1.ebuild 1024 BLAKE2B aba682431a426df5c7a244d5cb5c0914e8164b991ce4e729f73bbb1d30a6d94c849d5f6da13022498538b9a7af6671dae5cd84c66684cbd460290cec96224439 SHA512 034c465170472fed627b30322f1df4ccd6922593d4cef0425b0bb5af462e024cae40c14e36f6cb62be35fa5aeb75594ae131008409d9a5005f64d41154f7450f
+EBUILD helm-3.8.1.ebuild 1016 BLAKE2B 77f562996bd1889657a7e0580c13ee3fd572dbfe4128458c807f52d5f56e4bf3ec2d9b8ccf24dcab6608c13131f5c502a8736ac9c809d4c140c30f01c077b97c SHA512 757201e6bd7e08012b636108601dd322d8ab81f3123aef79e94a223dadc1aed6bb90f809b765bdd9f9a3f2806eba7efe770e62d80c53f52d3bfee17459669c98
+EBUILD helm-3.9.4.ebuild 1023 BLAKE2B 8f8240b78db8ce74791d313c41ba0c48b9a806b7cfbb65a090f3f3ac286799111b83cbce4db91d521b41bdc89d292b496df3089b7b180a7b8b243c1229abb944 SHA512 f87df213df0f7d43f12996972c54b58941b235c0ef081c852a5c52ec7aff0c49a7a577c01758ff5b0b9504d2532246d8e4fee21133a8a01ede034fcf3c22e19e
 MISC metadata.xml 323 BLAKE2B 5001082c76e55c24c27deced68a33a8fc8c9514b65116aa076ade0bacab00103a19e0807af8187b7bd8b761e64f20c4fab74b998e0f9ec473fb8d2bc9cbe4412 SHA512 a039551d398af15db8fb487b058ad569731376c51f8a23c245e4c14cd8924b960a2dcb286618c9365d21d219a271f1e0c6bcab712cf88920f4fc7fded832d800
diff --git a/app-admin/helm/helm-3.10.1.ebuild b/app-admin/helm/helm-3.10.1.ebuild
index 9cc7aee7c8c7..ff7b42ae9747 100644
--- a/app-admin/helm/helm-3.10.1.ebuild
+++ b/app-admin/helm/helm-3.10.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/helm/helm https://helm.sh"
 SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~riscv"
 
diff --git a/app-admin/helm/helm-3.8.1.ebuild b/app-admin/helm/helm-3.8.1.ebuild
index c0d0f73bf809..41cb13fad22f 100644
--- a/app-admin/helm/helm-3.8.1.ebuild
+++ b/app-admin/helm/helm-3.8.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/helm/helm https://helm.sh"
 SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~arm64"
 
diff --git a/app-admin/helm/helm-3.9.4.ebuild b/app-admin/helm/helm-3.9.4.ebuild
index d707e5503876..68afbf1f982b 100644
--- a/app-admin/helm/helm-3.9.4.ebuild
+++ b/app-admin/helm/helm-3.9.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/helm/helm https://helm.sh"
 SRC_URI="https://github.com/helm/helm/archive/v${MY_PV}.tar.gz -> k8s-${P}.tar.gz"
 SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-4.0 CC-BY-SA-4.0 ISC MIT ZLIB"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~riscv"
 
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index a4520bda9ef2..667d75d92e46 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -4,7 +4,7 @@ DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d
 DIST keepassxc-2.7.3-src.tar.xz 8963496 BLAKE2B 7f467960eb618d771e24980caa41ee15ecbb2bbfc6c0d37ddf1c8209e06b81a30b157c9ce00b3fd6c91c39ebaad60cec3513f7c1a64c8b7e0e2f0a116246f080 SHA512 29bf067308915d5ac7843eff3bcfb6c4c53a2108e9e2f5349ed03a0b8893f143dcc743cfc175c0831709bafef566d66baa31c5fe3e6fa5fc9c621bf87362e842
 DIST keepassxc-2.7.4-src.tar.xz 8957372 BLAKE2B 5b8ea105c35956f85779187df624f373f9e6937e1edc454b2a5cbc851ddd2ef0dd556ec74242e3a67c314c1e4b0750987a498d245c3463a5e92254ad0c394ab4 SHA512 76b6ba0891d9ba92a5794ba6f25dc8a28f7c1c0f010c31dd49d52ac4c5f186d9c4b51e6f054102b6dfe2d8e766607455829c1994c7ea238efc8f172bbe29b8eb
 EBUILD keepassxc-2.7.1-r1.ebuild 2368 BLAKE2B e1d3f23456beb2057c29f4040e9244ca2f2452a2dbd75ee8bb807b4921b2a0aa1519aecd31a21a6caa8c4c7b6295cd87bf66f9c01d50c4c98425728429287aeb SHA512 e90e777e8c8ea57551af72b11d82fa5e4fa6bcbe4bb424e0de39b99dddbd8d21b80e5cd1c49c12485da414e3670145144f31a6aa77b0ff163bcccbdb08e23207
-EBUILD keepassxc-2.7.3.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
+EBUILD keepassxc-2.7.3.ebuild 2527 BLAKE2B 719bdba36c5228cc45fc691a114a1b246d8ad6f9577ebfaba25e2b9f79c24892b948ee445a778eaf705b5cd2f1fdd7eca9d27c242196af36ace971cbbbfb5130 SHA512 119753498d14adc8e654dc53bc30aab27677b7587f6f776173a69cf14603f8781465798ae78405f9deff6762c99896c05ef69673caea22d4597efe635bc3a64e
 EBUILD keepassxc-2.7.4.ebuild 2528 BLAKE2B 36e886583566784815abf90873c09c1e5698d67b6f68945df44aac762e95b3d9866926a2e7592bbe2ad52074d048bdf725daa15674c7caace351a28e70e0ef7f SHA512 fb853fd1a83b2d83bc33b145535f703282e4a726da1f81df6e60186e45ed6d6b26bba0086922fa71ef9cc6f1308c75a5ea3d1c6620a82b7a9646bf3b3277abca
 EBUILD keepassxc-9999.ebuild 2484 BLAKE2B e01ba45106ef10b452c746cb31b82359aebc7e0149574c39202ac34ceeb28a0f5dfcdaec363f07af580e89bafb6fd2000d20a37f835050538c26bc84eb3b774b SHA512 bca31898fdf2b92c2728f2c4023702268d797993acee7ed7517b051b43f22a3c6e46d1775b2fa5ff2835f4906a16868cfb7977eaa3247ddbaa27263df592793e
 MISC metadata.xml 1077 BLAKE2B 410793b2f278ccbddceb10a72e4a010f4b2d6fc81bd8a472b867e1230d43a0e6f461ff6459095d334536d462e2297c4978dbb247e3a5ccb82c36fd70c6f44b51 SHA512 d338787a7ea319d752c19314ee53ee1306293ae2dddeedd22bd010e990a1680fdd1b96c5173c653b4dbbe336d713a07f9fc1a771951fca8636b3973361787f20
diff --git a/app-admin/keepassxc/keepassxc-2.7.3.ebuild b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
index eced3151172f..fe3795ec295f 100644
--- a/app-admin/keepassxc/keepassxc-2.7.3.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.7.3.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" != *9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+		KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index 47947c764d9c..6b5124114410 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -20,5 +20,5 @@ EBUILD rsyslog-8.2102.0-r1.ebuild 12864 BLAKE2B cdbbbe6c4b582c5d899318ebffc5a3eb
 EBUILD rsyslog-8.2112.0-r1.ebuild 12918 BLAKE2B a6b90c61486be47ed3b22a9bb5c7cc8b7837f56db21d88353403c50ef427fa4cf364a964db74d0a07fd15f4420cd87441a4d51edec4ff19dfbce7ef7d4c787f1 SHA512 a9b6313794a45610b62a0ff700c89db057c9c825445a124ab7b10826e379333fa236fa9376f4c4c798519f163ced12c9d753a63f48c1840e1d705d218bbb329f
 EBUILD rsyslog-8.2206.0-r1.ebuild 12965 BLAKE2B f57c348fd034c19ab6f68da85f881c14a1cdbbd06c89f7f0cedcf72e558dafa591acd8b9e6a1739bc0482697148f51fbaf5c10dadb8b75e9d50ca1cf794ca378 SHA512 47784827bfec562177f1673d8104d0820aef01153e5623aa5e4e96d1533ff30143b442b7613cea48799d4ec0da34fde913f47a204ff3c35116d36b2adb434af3
 EBUILD rsyslog-8.2208.0-r1.ebuild 13067 BLAKE2B aecd341b7586a62aef07e3f246e1fccb259d309f6cb705366c8a4f30c9378aec9e4fe847b2b2d445bc39773056ba8775caf4dbd55055727b5fe4b3f8acc14f87 SHA512 2f5b4e086c2dba4dadd9631cb6fbe7c9629990d6de465416c3d1ed0486485a3690a9d874cd65407dd5e41b16bc778f3aa0292d533b063a89ea026bc4d5c87d97
-EBUILD rsyslog-8.2210.0-r1.ebuild 13121 BLAKE2B edb194a685ae26b7c9c4df409849dba67e08a0d200bfba8f926b87812b5938a71b1dc12c1d89e3be769711a16cf0205b143c7b9a66082e355ee430897663373f SHA512 9ebfc09cf6100d934b3b3a0548c4dd599c8b19744d14630f3708d154447df4333146b2537b8962bc102ea227e661a9cfc8190c7da6b1c16f0c4b9b203efa92e6
+EBUILD rsyslog-8.2210.0-r1.ebuild 13120 BLAKE2B fe17613b97797a3d27f51c36dd1fb4a66dae4f390a6a3c3f2cf0379ab82bd84b39662151da276b2f4efc18455afee9a2c608b033538605a0e0e208a9f0381582 SHA512 9c79f191a4d24ae8f28c49dd2e305654fd4bffaf056d119adcb3b3abd0788d899b63200ed7322755a68ccfffc54247b62ba484a353a38fd59acb84dfd866c43d
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
index 87304e80c4a9..06d51ff743ae 100644
--- a/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2210.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz