gentoo auto-resync : 27:10:2024 - 03:04:35

12 files changed, 8 insertions, 400 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 87dc0f41cb7d..d507ff0c5f1e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f76105d57683..282bad34503a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
-DIST aws-cli-1.35.0.gh.tar.gz 2806480 BLAKE2B d607933a9baa0e50ab8d809e0ecb68681e90815fca7db6b69b01a632a56d37a62bedaf6dc981bffaa0206b31b6ca84b3d5e3524289b9b2edc55ef1989239a696 SHA512 2008b00455755b3c332b83d6df3e86f461a94b401aeb022887feddd6f5f3ab439b382d24d46c4e0da825df24899ede6307c4e482987d07171d38704c85ac4eb1
 DIST aws-cli-1.35.10.gh.tar.gz 2811446 BLAKE2B 3151e107099821ffa3978d4a0175bf96ab9f789bb122f941cf28cac5115d1e6b97272b73e56633910721cfae0684266b7d311886e6fb414330ff9e4791581b4c SHA512 85be98b3e80e2af85acb0ac982cc85bad6789f6e051c95b7df5cc3eb313c677d6a66117a3418bc44f9c03ee6385b68b401839d4b9a609caa65fc59e8ddb55624
-DIST aws-cli-1.35.11.gh.tar.gz 2813001 BLAKE2B 8df6575c77783031d52ab99f34c90092bbb5ee67584b3a13bc29f4b171da08534f3851b2298074123e12ce8e43a2b7e98d812619652192ad5b1f97a8299f14b3 SHA512 8df319bb806233e5e32ef8bd07216b9e17966b49d5d3cb36c90bc92c7161120dc1e6434181920df62562e36dd2cc664d4b1e95e8ba953879488df25e56570bfc
-DIST aws-cli-1.35.12.gh.tar.gz 2813508 BLAKE2B 817fc49d9225c7b5ef9aa95560138e348e872ecb46ea6be415d1b41d5989eec87ee3d9fdd265c0af2e28c2dba2e1a3e2e794a43d6cca170d639184b7cf3684cf SHA512 9f8fbb9c931d9b3c1d00e25e1018b2dbca7014a5946cf1f17155d18e47837218f8575e0e2a3cc64902d3b3baa8ada99f6e01a72f5fd74b209f807c646023c2c2
-DIST aws-cli-1.35.13.gh.tar.gz 2814615 BLAKE2B ad59cfe26615902f2161b06f2ec5ffdfbad5e0ee15262a2b5d32cf4a2031afa1825c476d06cf072b190be6eab9991e7ce3f524c7864e52538726c3730bde07ca SHA512 4e23f8d64469f50b02858289387b5405474e292476b576f3f494a1efcec896abdfc0fd4f3b66423b13354628c81571f4be7152fbc9ed13de166f551386837b35
-DIST aws-cli-1.35.14.gh.tar.gz 2810216 BLAKE2B ea6de63fff9122dcd4eb47eb6cf45928321c69c6ac840b05a3183539b17e406c9056e2fcd60bdbfceb76a2ddc38844df93c80ccc9a507627c862059767b478c7 SHA512 bdb8397d02f77f8a7df37786027d6c26433a99ebc8947ffffb9f7775e75f0d926cf713686f07e7c996f4613d45e8277e6ecb2da5fb29109b023751188197e193
+DIST aws-cli-1.35.15.gh.tar.gz 2810766 BLAKE2B 18a8464acede1801a533da89191c31309944123f092a08790d79f1a05d57be9540385e9acac75240c6595573685fbb3046ff3e85530881e25f54bc4213b944c6 SHA512 def601f10f9e4afe3b17b98bdeab58b3fe78b2171d5cc4bbe5892ae8fc348a1bb3467ef8051f6005091708df3c9e3bd85751cedf372f8730ee3197b6e833a652
 DIST aws-cli-1.35.5.gh.tar.gz 2808789 BLAKE2B 545c76bd349485fbf2dc5565317678904c99443e2e6dc2e12fa9de122327d8aa0e8b9579cec37afe2e949a0c31c48e0977e52d701ffc212182c692769c35a948 SHA512 2a9c86f1a63b657d3c95f8a65020ea7837ded9f5147ce31a535f59b9d9c1c91c3354a82286c25252da7d5b7c48c1898f594be0cb9e1ba54c6768133543fcba50
-EBUILD awscli-1.35.0.ebuild 3025 BLAKE2B 86e71661fdab5c89b9e91350b6e8036bfa9d21768e2baacc47099dcb87fd428d15e4ef1d742dd3498bf03da983ebbebefb0235e13c2e493951ca966993f5297f SHA512 496f15c180c3337fe658f3df5a7f596526fbe2d6b65c134923ceaf0b74b21eda861a6924dff83a6d9f5500a3de9560b70e6527f406f57e17be093959b52720ad
 EBUILD awscli-1.35.10.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.11.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.12.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.13.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.14.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
-EBUILD awscli-1.35.5.ebuild 3141 BLAKE2B 5c14d1ada2a8692c95bc6975412782283583a98ea26a5ae45940f7451aabac59b5cbe4f384fdcf1ebf8bf0face6924215f7b0c1c40c1c2dcb8efa1c043b40a05 SHA512 14a538a63dc521fb224d0f2c2e5e24093fa1195266bb6e00780b2e9268d319eba20db9db6c9327bde131b756076de9f673865d4f49954b7779a5df360a995c34
+EBUILD awscli-1.35.15.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
+EBUILD awscli-1.35.5.ebuild 3134 BLAKE2B c2ddd86359d913936a50c8800f366e44108dcfe932ee27ce6749120f8c99299386663d819486e9c20c11933170bea250e601505dd12504d39802b36f3f6e7d68 SHA512 58b0c974de9872309ad7f53bc515855f8755d468d4cdd42f7f04d2e9e22c2a410a8fcedda4d1c1b87a7d342f89056b75bc0d704eeef9fc93c699bb8bcadc14f2
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.35.0.ebuild b/app-admin/awscli/awscli-1.35.0.ebuild
deleted file mode 100644
index fdb4100fa240..000000000000
--- a/app-admin/awscli/awscli-1.35.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.y.(z+34)
-BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.12.ebuild b/app-admin/awscli/awscli-1.35.12.ebuild
deleted file mode 100644
index 0fc6192a8587..000000000000
--- a/app-admin/awscli/awscli-1.35.12.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.y.(z+34)
-BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	case ${EPYTHON} in
-		python3.13*)
-			EPYTEST_DESELECT+=(
-				# flaky (some ordering?)
-				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-			)
-			;;
-	esac
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.13.ebuild b/app-admin/awscli/awscli-1.35.13.ebuild
deleted file mode 100644
index 0fc6192a8587..000000000000
--- a/app-admin/awscli/awscli-1.35.13.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.y.(z+34)
-BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	case ${EPYTHON} in
-		python3.13*)
-			EPYTEST_DESELECT+=(
-				# flaky (some ordering?)
-				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-			)
-			;;
-	esac
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.14.ebuild b/app-admin/awscli/awscli-1.35.14.ebuild
deleted file mode 100644
index 0fc6192a8587..000000000000
--- a/app-admin/awscli/awscli-1.35.14.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.y.(z+34)
-BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	case ${EPYTHON} in
-		python3.13*)
-			EPYTEST_DESELECT+=(
-				# flaky (some ordering?)
-				tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-			)
-			;;
-	esac
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.11.ebuild b/app-admin/awscli/awscli-1.35.15.ebuild
index 0fc6192a8587..0fc6192a8587 100644
--- a/app-admin/awscli/awscli-1.35.11.ebuild
+++ b/app-admin/awscli/awscli-1.35.15.ebuild
diff --git a/app-admin/awscli/awscli-1.35.5.ebuild b/app-admin/awscli/awscli-1.35.5.ebuild
index 49e2e891cd54..acc47104059b 100644
--- a/app-admin/awscli/awscli-1.35.5.ebuild
+++ b/app-admin/awscli/awscli-1.35.5.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.y.(z+34)
 BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 773b7a73b9be..79e49697fa41 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -10,5 +10,5 @@ EBUILD puppet-7.28.0-r1.ebuild 3464 BLAKE2B 5c9818baed85e31a7785efdb5194190f1916
 EBUILD puppet-7.33.0.ebuild 3068 BLAKE2B a3d828bacb0c309de40074b565d38a053be9b35648c075b93d5e457ded76031d9721adcc314d3ad16b4d59082aa7c0033a5745344e130fa52d6e96d759eee7b3 SHA512 4735260aaaef1fd77659b46d82861b6d43ed2e7952ef768391ffcd9e604198beef657e4365096f9c23dac0f7ad51d70505f919cc333e5f4e83ea46f21d98983b
 EBUILD puppet-8.5.1-r1.ebuild 2898 BLAKE2B 421ab14d4907e8c8aa091dd97b9883dfe3e235ec3ae83b906bd4e14028ee022db1a87fc084c3c14d870ffa4553e0deaa37936f61ef8326a434c06ad9a95e989c SHA512 463ae7d3f2c7c6ff41295a2f4e7117cd466ade90f6b0e2c477d731327f87c23d7fdcfaf5730722310652e566ae8f017c5b52d013bf7277bc163418e6e75613b2
 EBUILD puppet-8.6.0-r1.ebuild 2898 BLAKE2B 421ab14d4907e8c8aa091dd97b9883dfe3e235ec3ae83b906bd4e14028ee022db1a87fc084c3c14d870ffa4553e0deaa37936f61ef8326a434c06ad9a95e989c SHA512 463ae7d3f2c7c6ff41295a2f4e7117cd466ade90f6b0e2c477d731327f87c23d7fdcfaf5730722310652e566ae8f017c5b52d013bf7277bc163418e6e75613b2
-EBUILD puppet-8.9.0.ebuild 2899 BLAKE2B 76976136618b5c8dbdb334ee2265f472a33b038f7e3cdc030b7571e1fc710c0a2df47fb9b1516a6f2dd9b697d9a5460fddb06d4b5fceba9dd55229a19c42ac52 SHA512 22f1548014ab294c56eb29a07bcf378b518c389737e1c10ac151c9ef2b718724230906e8d0b2e49e30c91a29231e80c8d9966e134c01802ed061b5e5ed03d419
+EBUILD puppet-8.9.0.ebuild 2898 BLAKE2B 421ab14d4907e8c8aa091dd97b9883dfe3e235ec3ae83b906bd4e14028ee022db1a87fc084c3c14d870ffa4553e0deaa37936f61ef8326a434c06ad9a95e989c SHA512 463ae7d3f2c7c6ff41295a2f4e7117cd466ade90f6b0e2c477d731327f87c23d7fdcfaf5730722310652e566ae8f017c5b52d013bf7277bc163418e6e75613b2
 MISC metadata.xml 1496 BLAKE2B cc2549141aaf5623f65be274fa8195fe6ee2826620050284ab0a7f60ba04832ecf8fe0e0890c470c98095946d1e4e7a0ef1fabd4d400c47d086fe173769f3d8c SHA512 1217b23c939409ae6cd15286b3304388893970276c80bf11284769946856ba1db20ea537fee5b7b2183305a24c88c926804e21f246f508e40cde41f45f1490bf
diff --git a/app-admin/puppet/puppet-8.9.0.ebuild b/app-admin/puppet/puppet-8.9.0.ebuild
index 2819be6cfa63..131fc7f43382 100644
--- a/app-admin/puppet/puppet-8.9.0.ebuild
+++ b/app-admin/puppet/puppet-8.9.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="augeas diff doc emacs hiera ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 75d72b7f49ed..764752b29904 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -5,5 +5,5 @@ DIST puppetdb-8.5.0.tar.gz 60440356 BLAKE2B 8c3116b040c91a1b406e56b419ddd7e31a5e
 DIST puppetdb-8.7.0.tar.gz 61636500 BLAKE2B 3e65c3e28935cc0a43b239f9d1c11e3807535c448f35e6c9e2c9191b636ae74b310b13345922144041f8052ca4e450db8f4e6a3362e5f9220bb422dffde3bd02 SHA512 fd0b1ae050d39393afb108ce3b60e49080eaa23de96b7e0afd8839d1f57f76cf66febbeb450bf7e975df7550f3817f44ae7c0c08c2ad591c09e30184ed4fde86
 EBUILD puppetdb-7.13.0.ebuild 2705 BLAKE2B 7328385eb13d39f37a2affa82b49ed2fac94e68db460ff735fd4a78d26bed884b6047b4d6c5a91b7fd7f93a955e261f9f97cf0833b1d6fa67d06b65fa7eb7080 SHA512 2fccfbbab1518ca3bc804844948547f489a69b908ce04ac93ed88f2b5f241203bfe623e87a0900fddfc2b2ffe5636768bf0ef1258f1dd27d233fbfcbbbbef74b
 EBUILD puppetdb-8.5.0.ebuild 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
-EBUILD puppetdb-8.7.0.ebuild 2703 BLAKE2B 90f165413fff3f0feaee97dbcc2e6fc0bb76f22a29e7157589e8dfb7c0a9b0d0b52250fafb1f203fce2baea8fc470b807c62e7cba290fa8b7e1c9f34ae8c5d85 SHA512 147223a9bbb4b2ae4b459d5b25f1c821d4d0ca1115ec85ab44dd11740044a9a0cb0e8ea261f641817a4bf8e6912ac45825d4117176333682ddd73eb3ba40bd35
+EBUILD puppetdb-8.7.0.ebuild 2702 BLAKE2B 764c25b8a8071be7f67fce96a88d61f06e98a0a25c07fc154b39a41c6fbf624954f94596dc2625a9471f5a6571bfcc669aa2930548d42ceafd0b78747b0d1f26 SHA512 63c7bd0dacaa4b4be81f26da9d023235fa82b80376aaa6e32fd846b14752230325185cc707e4b0b1b0277713464de694aa5b6c3c10147ac15d1b89130ea45f2b
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-8.7.0.ebuild b/app-admin/puppetdb/puppetdb-8.7.0.ebuild
index 387c27bf3a3e..4b5a495abffd 100644
--- a/app-admin/puppetdb/puppetdb-8.7.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-8.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-11"
 DEPEND+="acct-user/puppetdb