gentoo auto-resync : 10:08:2024 - 11:05:14

11 files changed, 4 insertions, 464 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c59770b72cee..e49e22638925 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index cbc01a6248cc..a529a1fabded 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
-DIST aws-cli-1.33.27.gh.tar.gz 2758530 BLAKE2B c40db2483f0561078d1dc191e1d8c97bae0d0ab00f0ca11db796213567943f7dd816143340c6c9b9c28012d2881d860948138cc41b37555b7416a5289c7a5cd8 SHA512 3716ef6b5ab7db33496f31445d6ec404b89fc8a3fec564dd6644d43d4ea0db12aadcce545a481e955a166000386d8183e801780b6ac16e03bbea0f5ed9a495c5
 DIST aws-cli-1.33.31.gh.tar.gz 2765982 BLAKE2B 424422520aada1a5ab21843e61d5027937c1cd306936740ce6fe80ac8beadc5c5885727d716a7efe1890a3a3d7138710cb4b43a04d5293593d8b6fbf94e83ff9 SHA512 d7f860cb1b37c32a05550a43ff4c7e691f90ca8753fead9e1f2590556e589d6748ba163408ffbc7ecb1b1414a9df3590ffd5962aaf2acc6e49fff60a101034cb
 DIST aws-cli-1.33.35.gh.tar.gz 2768498 BLAKE2B d925c1a63a73bda27711d2f930d0832ea17e012d62d634330cef16f1962cbcbeb9149a5ef14765af04bfbc4b49c6160a319e02a3eab475473a2fe46ab27da305 SHA512 5804947acc002cd9f53b94865542d4f4708116a3a31dafd6a217e84d2222ff973b6c6af0237272d52d9d15e0eaf7f243ef577c1a1b3c2f18e845857886d9f2c1
-DIST aws-cli-1.33.36.gh.tar.gz 2768813 BLAKE2B dbeaf0049d855da5b20c6ce24201dca4347ce72ca9546b1a6479d864f650fb39b0e557cf1f3a35a3165c118700fd0e06417c2ae594053992a8d16c3a95376e43 SHA512 6de8542a11bfa6e076bb7d99f6573d04b16bcae65c07a33b518d5dc3ea20dacf899f6929c8892731c98e77381ce5986d82e508b2f2c72854d3cd4c647979d41a
-DIST aws-cli-1.33.37.gh.tar.gz 2769229 BLAKE2B 39ef0d26e555f197cb4b4b588dc1fc9cad1562ba15926e349cae6e409bced94443403c6975ce08c69431accc45557e5659c6a23b686c7d046a7a338b4968a6a1 SHA512 d50150e04695ac651d27c7bdd23e79b5031f9e54fe2f00e6c1b78b5d2a22afac34a242e6473de52c813d85c219274fca472abb9dc70318c203a7638d2f869e42
-DIST aws-cli-1.33.38.gh.tar.gz 2769355 BLAKE2B fd943a5d41a2426ad022156f48f972915d019e0e20ab9b64d498426402c0fa5d1ab45ffd1927fcc5a49d62266c3b02a81c3875f396e3fc919fcaae1e9b8d5f1e SHA512 27759a759eabe66d2b3058e1c8acb747debf34f5b737f5096937886771d754f3a926a7da82d4fc4e68cd118338a86945f6f4ecc3d23f297af32f12aa1a8f1323
-DIST aws-cli-1.33.39.gh.tar.gz 2769718 BLAKE2B 5e391d01bce3beb424c4ae3456c782db8471aa6bc9f06d78b2855bfbf873dd41b5c7477a43bf80e7b996b5100c962024b5f5466b3772cbace319e6dbb01403c6 SHA512 00eb50f95d786abfa52591f3bc811854dfb769e0a1541d37c846a11553aba1ebe58f851d52d42720472abdab76e269e1b398595ca1bd5c11eb68912b3e8c7eb4
-EBUILD awscli-1.33.27.ebuild 3048 BLAKE2B 4002d52c91dbcd135f95485348470378b344c96349c05b8cf1424900a18cbe82683c050253b47d845dcf0d4373ed97946287f1e403e5d2a7e0b2646449257a4b SHA512 ec71ff0fdf28ff024763abb7e7f603521b109f027cb56c2806ab6bf50c71a02947cbf067d112451093df8ae6c786585effe20c5c980138d7a8149219d59edfff
-EBUILD awscli-1.33.31.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
+DIST aws-cli-1.33.40.gh.tar.gz 2769444 BLAKE2B a26e26cb4694460e36fe2d9730092db33aff74e436642f3de5f94dc2fcbb594bb1ef2db425584359f50d0ae37be8be6034a0e722968a0ea4179e888b2f23be7c SHA512 d19d762a1ca0b02f3076d9241be19755f74c2b228cdb258f873d73dc91f25730b40e4a82bed3cb77e94b30ba34e1260629a3af6e7a7b7df108522d21103f34bb
+EBUILD awscli-1.33.31.ebuild 3048 BLAKE2B 4002d52c91dbcd135f95485348470378b344c96349c05b8cf1424900a18cbe82683c050253b47d845dcf0d4373ed97946287f1e403e5d2a7e0b2646449257a4b SHA512 ec71ff0fdf28ff024763abb7e7f603521b109f027cb56c2806ab6bf50c71a02947cbf067d112451093df8ae6c786585effe20c5c980138d7a8149219d59edfff
 EBUILD awscli-1.33.35.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
-EBUILD awscli-1.33.36.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
-EBUILD awscli-1.33.37.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
-EBUILD awscli-1.33.38.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
-EBUILD awscli-1.33.39.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
+EBUILD awscli-1.33.40.ebuild 3055 BLAKE2B 442cc5222134bd9b622bc3f9f35b1882cc0ff4c8cfe9b5d1a5cae7fe09f1d7036d057ab1e231f5cb29370aaabea11be300ace2fbe634cb38c819b401a728afdb SHA512 00175b451b0c44db1b3e57fa56f4bd845c6b91a5409412e8b7580eaedea5c2c17e4841ad6fb1ae6d65cf94d302259493a961e8e1c4f30cf928be229bb8e0486a
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.33.27.ebuild b/app-admin/awscli/awscli-1.33.27.ebuild
deleted file mode 100644
index 350b274749f3..000000000000
--- a/app-admin/awscli/awscli-1.33.27.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+1).(z+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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.33.31.ebuild b/app-admin/awscli/awscli-1.33.31.ebuild
index c212ce9cac21..350b274749f3 100644
--- a/app-admin/awscli/awscli-1.33.31.ebuild
+++ b/app-admin/awscli/awscli-1.33.31.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+1).(z+118), sigh
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
diff --git a/app-admin/awscli/awscli-1.33.37.ebuild b/app-admin/awscli/awscli-1.33.37.ebuild
deleted file mode 100644
index c212ce9cac21..000000000000
--- a/app-admin/awscli/awscli-1.33.37.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+1).(z+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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.33.38.ebuild b/app-admin/awscli/awscli-1.33.38.ebuild
deleted file mode 100644
index c212ce9cac21..000000000000
--- a/app-admin/awscli/awscli-1.33.38.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+1).(z+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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.33.39.ebuild b/app-admin/awscli/awscli-1.33.39.ebuild
deleted file mode 100644
index c212ce9cac21..000000000000
--- a/app-admin/awscli/awscli-1.33.39.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+1).(z+118), sigh
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(( $(ver_cut 3-) + 118 ))"
-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.33.36.ebuild b/app-admin/awscli/awscli-1.33.40.ebuild
index c212ce9cac21..c212ce9cac21 100644
--- a/app-admin/awscli/awscli-1.33.36.ebuild
+++ b/app-admin/awscli/awscli-1.33.40.ebuild
diff --git a/app-admin/tmpreaper/Manifest b/app-admin/tmpreaper/Manifest
index 06f3dcebdda1..8e692f57e893 100644
--- a/app-admin/tmpreaper/Manifest
+++ b/app-admin/tmpreaper/Manifest
@@ -1,7 +1,4 @@
-AUX tmpreaper-1.6.13-fix-protect.patch 1204 BLAKE2B 8c1b66d939ac8e997272265744873a22a5e5306d8fbec6e56ace78cf4162387c2cb2c2d7372ec62f0e7c99fa954d7e321482d0dbaa75ba6e3ff48a8785277e3c SHA512 7b7f386d8f685e6b38ff3a96030e69a5134016e0a0b30b6841ddc4ae02ae3f90c47388426be98ec35a920e40360aa0cd8662e29d03a765c6ae0209f9907c53c0
 AUX tmpreaper-1.6.13-gentoo.patch 1766 BLAKE2B a619096b159686dbcdaacdbd3bf979f74664f8abb2c58957dec7fcb17bee7c1b5b790f4e7283af9f82fb1f7eac2a76f73c5ec26804c6bd799643d553fb56be17 SHA512 0086ac04a352bd35ce9e95576816fc324011bfff78cfa089828bf3befb8b183ae2213be9759422ce1f9ddd1cb26dcdf292b429ffe2d0873a1f6f6577e34c5fc9
-DIST tmpreaper_1.6.14.tar.gz 158981 BLAKE2B 1c9ec124c6e57c0aab5d555594950dda37f06a6404a0d111da05be7a48bf6141e09e942c090d3f79ccf855f958a7b32f0d64c73da68b412da74465e39bdb72ae SHA512 e78fab0cd2cc8c851e2806be70c102697bff86230e181bfad1c76b15fe5455fb431bc0dd16bebf77a2e9bb64b5f5a1474d24254ff780d4d72d343ea0e6e30ccb
 DIST tmpreaper_1.6.17.tar.gz 158894 BLAKE2B 537e8020a9db4adc9dee5b967e89242573d340c8b1d3540ab2de76d9a74bae391ff398d19b71c4017bde04716f01f8958bb73957215b1b44628e5ae7ad805f8b SHA512 8272cb0232f8188f8ad45be40442b686d18bbf508dcd440d3f901f4dbf7d17e05da91ee3bfa5d23d163041fdb08de81d525ac45945f10bc7ff886ac468fc4ce0
-EBUILD tmpreaper-1.6.14.ebuild 1140 BLAKE2B 90ed79e0bfdade02d0ae118aff75bc561a76fe887f59e930cdbda1feae62e010abce327a712db9af14ddb32b29281eeccbfde89bb71fc24bfdd84fc72bf8f6bc SHA512 64e8ef4d1e5bdba4ea3e78e95a3b2ac9079179dfe744611b594705f119567212273c52dd6f4f4a06043b4b517628f4fe86a1eeffc6ab98d4c98c9428d0f0adaa
 EBUILD tmpreaper-1.6.17.ebuild 1051 BLAKE2B d6c562ad0c56decdd26d92f3ea6aface7a2f126467d088200971fa6c399e580090c0e49552a513b746f860c59e30e24a102fc381e663777652769df18c4d00c8 SHA512 f7a23e20d64f7444c5ab217faaec6c0b9557e6a8600a20110aaee9ab7052b151b1e4ba2af976d32fb245db1bb3772b696b70476019b5fbff9a31427847f77323
 MISC metadata.xml 1084 BLAKE2B 2a926ce68b2da9c8c71917baf8c2da1826c46d79cb8b8aa61600ffc7b9666b45117d500f0768950a420e41be7d5e3e64c08cd95230cabb85c64396607bef3f71 SHA512 fde31afd78bdfc08ee4809364a7b5952039c88574216c320d3ec2e6c7983927c2e892250d119f2de3b1d5b6e659acb0eb512092a107e7a62fae1d14ddc2d1520
diff --git a/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch b/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch
deleted file mode 100644
index 9c07a4471e18..000000000000
--- a/app-admin/tmpreaper/files/tmpreaper-1.6.13-fix-protect.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- tmpreaper-1.6.13+nmu1/tmpreaper.c.orig	2006-12-05 10:55:58.000000000 -0800
-+++ tmpreaper-1.6.13+nmu1/tmpreaper.c	2006-12-05 10:56:46.000000000 -0800
-@@ -467,6 +467,21 @@
- 		    continue;
- 		}
- 
-+		if (FLAGS_PROTECT_P (flags)) {
-+		    skip = i = 0;
-+		    do {
-+			if (sb.st_ino == protect_table[i].inode) {
-+			    message (LOG_VERBOSE,
-+				     "Entry matching `--protect' pattern skipped. `%s'\n",
-+				     protect_table[i].name);
-+			    skip = 1;
-+			    break;
-+			}
-+		    } while (protect_table[i++].name);
-+		    if (skip)
-+			continue;
-+		}
-+
- 		if (S_ISDIR (sb.st_mode)) {
-                     char *dst;
- 
-@@ -489,21 +504,6 @@
- 			     (u_int) getpid(), ent->d_name);
- 		}
- 
--		if (FLAGS_PROTECT_P (flags)) {
--		    skip = i = 0;
--		    do {
--			if (sb.st_ino == protect_table[i].inode) {
--			    message (LOG_VERBOSE,
--				     "Entry matching `--protect' pattern skipped. `%s'\n",
--				     protect_table[i].name);
--			    skip = 1;
--			    break;
--			}
--		    } while (protect_table[i++].name);
--		    if (skip)
--			continue;
--		}
--
- 		/* Decide whether to remove the file or not */
- 		/* check for mtime on directory instead of atime if requested */
- 		if ( FLAGS_MTIME_P(flags) ||
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
deleted file mode 100644
index 94a33705d57b..000000000000
--- a/app-admin/tmpreaper/tmpreaper-1.6.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A utility for removing files based on when they were last accessed"
-HOMEPAGE="https://packages.debian.org/sid/tmpreaper"
-SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND="sys-apps/util-linux
-	sys-fs/e2fsprogs"
-
-RDEPEND=""
-
-# fix protect patch from debian bug 636459
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.13-fix-protect.patch
-	"${FILESDIR}"/${PN}-1.6.13-gentoo.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-	insinto /etc
-	doins debian/tmpreaper.conf
-
-	exeinto /etc/cron.daily
-	newexe debian/cron.daily tmpreaper
-	doman debian/tmpreaper.conf.5
-	dodoc README debian/changelog debian/README*
-}
-
-pkg_postinst() {
-	elog "This package installs a cron script under /etc/cron.daily"
-	elog "You can configure it using /etc/tmpreaper.conf"
-	elog "Consult tmpreaper.conf man page for more information"
-	elog "Read /usr/share/doc/${P}/README.security and"
-	elog "remove SHOWWARNING from /etc/tmpreaper.conf afterwards"
-}