gentoo auto-resync : 16:06:2024 - 00:09:44

12 files changed, 6 insertions, 552 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7ea51b07b2ea..9f10bddc2520 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f6b09387bbc8..1736e00b0425 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
-DIST aws-cli-1.32.113.gh.tar.gz 2730091 BLAKE2B d7c88dd962f1be64fc57f19a3ad247725efdd14b611f752200d333297f99993f896855bc307fcab8ec76c6c00b982dca2f507023211f6ce54bcb6380f71f9dd3 SHA512 9dcc017e8b8ab9d9aef26c7bcbaaeb7256e20ba4abf4fe80580561cb46a61fd5e79e5057dc38b05b1af22a7b03610c88a1babb63c9503b16176010d2903661cb
 DIST aws-cli-1.32.117.gh.tar.gz 2732508 BLAKE2B 699d7596ea0e417f624f72e801d2c6e5c5b73aa1485f830d09923f12d00091e9252517b8f29f20212ddcb18e13b25b43f9545c759c68246a8a9db0a1abb0b047 SHA512 00731d552b372d7d0cd8213f9d645fdaa1b5691b9ee01a0e09ccfce169c0ca97052c03300e824c2522a3ca98a107a67106a31f818884b0050c0f66ba4131d8cd
 DIST aws-cli-1.33.4.gh.tar.gz 2740224 BLAKE2B 40fb26f895a28e41e45c861194ca959490d1675e2f9926bbcb5b092d4496b20be3e68f4eb370ffef541bd607c41181d34caa4e5674fc262b60cd882401530153 SHA512 faeced07895fc891803136061839d499b372cbf89e6e642e2782120d2b1a50486e01ae07ba7ee04c9fe84ffefd0e329e000d76f38f5839b048bbfdab59a64785
-DIST aws-cli-1.33.5.gh.tar.gz 2740011 BLAKE2B 24fecba55afd540859ef1096859bb7e6dc0c482cf7c85073308e68953314ecedd5e6dae2486c55014e068a864ad6e1c9bfa7222f4b0d4f8f2ddd706b29960146 SHA512 71715622e20b337056a720be2cbb0b473320fab785031a10d7b2cd8b45bc3b9d1682c456180e1210a13ac4dc669807326418f0619ba1b1d7941df3b9b26503cc
-DIST aws-cli-1.33.6.gh.tar.gz 2741326 BLAKE2B 538a9312dabbf208d3cc3642e7dd97552263dbddf5fa5630fe2170abb9700c26ecc473771884e25d626a25a9003a58a020e6922480035b76ea3cc0ff1b646ded SHA512 142bcc69e5a4ab6a46fca4189161b0f265cb0a8005ed3e80faed891d8176d69a9ab6d6667d695f92f7651bba0273e414140427f1d04375e9b7847fc1b992f810
-DIST aws-cli-1.33.7.gh.tar.gz 2741892 BLAKE2B 10ed7e314dc2d8dee2f59044366fca0a594f0b47943e62ac8bef8cfb9c243988f36c569a216eb264a65b8cf88e273528ca0102fdbe99046ce3e04f7a78169239 SHA512 efa9f18b7c8d6f5d61dc69fb0a8e6aadcbc380c72d8193143abdec3cf51cf793250ac5a2426d36de40369b30cf7322e6a6844534ec436285fed4c77ff2fb36fb
-DIST aws-cli-1.33.8.gh.tar.gz 2743565 BLAKE2B f799872b029e65314c774a991992c8387b7f6bf6f7207c1496b7ff126dcd9f8f4da61271dc36a9f9266f54af5a14ea99074df6fd6b13d00b10ef59528ccee77a SHA512 2d3b66e0c7414261bbdb2ca4f8f6748ddf3640137ed4f46a7dd2aae57890537712369ab8b526dadceb85987c18a67bb93ed901dd431ddf7fc239e5ccc9c9aa7a
-EBUILD awscli-1.32.113.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
-EBUILD awscli-1.32.117.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+DIST aws-cli-1.33.9.gh.tar.gz 2744062 BLAKE2B d888e111d93ec22c6bbabf083d612b15845883e2e56814a37173f79c108e4fe25745dbba83d46f99f54e7ddcc2f471c81e3b568de7233eb7e0bb51ed25a89f7a SHA512 5bdb9873487570c841b582ee466d989705c2fc5827386356819507caa8e105b76b0101555f8a6ee485f38aaa433881470fdde5cb21f6fdc88243c92ce7c31a81
+EBUILD awscli-1.32.117.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.33.4.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
-EBUILD awscli-1.33.5.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
-EBUILD awscli-1.33.6.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
-EBUILD awscli-1.33.7.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
-EBUILD awscli-1.33.8.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
+EBUILD awscli-1.33.9.ebuild 3055 BLAKE2B 1564ea4eaf31db7fef7e41b625d95906b7a57c0cd6160d9ec11e6c8cdec5460e0a12e889aa60f5b189bd9e24b0511b3d5a83a3755630c7d1478031c857c9ef93 SHA512 59151ce65e2beb06d0487e5779bf7c8916ecb7120b4e1781cdba8167205ca4f52666653b41f21d31ca89f3424249de030cc783bcc0f033e7502a0af82c4658dd
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.113.ebuild b/app-admin/awscli/awscli-1.32.113.ebuild
deleted file mode 100644
index b7c9ceb6d88f..000000000000
--- a/app-admin/awscli/awscli-1.32.113.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..12} )
-
-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+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.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.32.117.ebuild b/app-admin/awscli/awscli-1.32.117.ebuild
index 4a677affdbc4..b7c9ceb6d88f 100644
--- a/app-admin/awscli/awscli-1.32.117.ebuild
+++ b/app-admin/awscli/awscli-1.32.117.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+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.33.6.ebuild b/app-admin/awscli/awscli-1.33.6.ebuild
deleted file mode 100644
index a7a293c4a8e8..000000000000
--- a/app-admin/awscli/awscli-1.33.6.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..12} )
-
-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.7.ebuild b/app-admin/awscli/awscli-1.33.7.ebuild
deleted file mode 100644
index a7a293c4a8e8..000000000000
--- a/app-admin/awscli/awscli-1.33.7.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..12} )
-
-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.8.ebuild b/app-admin/awscli/awscli-1.33.8.ebuild
deleted file mode 100644
index a7a293c4a8e8..000000000000
--- a/app-admin/awscli/awscli-1.33.8.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..12} )
-
-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.5.ebuild b/app-admin/awscli/awscli-1.33.9.ebuild
index a7a293c4a8e8..a7a293c4a8e8 100644
--- a/app-admin/awscli/awscli-1.33.5.ebuild
+++ b/app-admin/awscli/awscli-1.33.9.ebuild
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index 693c6dd37323..fb9b08f7695b 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,9 +1,5 @@
-DIST Bitwarden-2024.2.0-amd64.deb 79917282 BLAKE2B 2066dc71bed9cddbcedccfd9129e3e81ac9f8a71217d2c651fb8a067b3e318574e26104b447a7ccd6734efded64ef3620cf4a7e36f0a577ed98f5468839540cb SHA512 c9394914fd6c82096fc5336e73b539e250727c6917af97961df0bd7de241f955b9eb87da154f32972c73ea1ce59bf0d79660658277185c89e099360ec4c3ea26
-DIST Bitwarden-2024.3.0-amd64.deb 80463348 BLAKE2B 668fd4c18507b349e5892e7511b4898764a33d9da0a837379c7856caa054782fbf6a3337b03a779a8c8111d2458f560b31c32856850ff931694a8f18d889bdc9 SHA512 9297367e82e76870b7f12becfca6ec3bc0ce8f6515f4e17e9830d4df599891c839a8f5990c97b684528c8a4ad1c24ddd3bc99c1552620aee84b81c1cbf115771
-DIST Bitwarden-2024.4.1-amd64.deb 80470012 BLAKE2B 64b451c3fbbac303782c68a366c66c32c49d0ecb52bcbc085451157216cc99fa888941e8c911c14f6a68aa6bb0413463b4296f108386e7b5b3ca8925c6dcc871 SHA512 e6edcd84f44062ccfa4152baf7dab230915d006f7f31de0ffcbe1acb62525777c7d653a7cb7c51509fb9ebcf5ba4219df97e5128853813a54aadbfd92ff2c819
 DIST Bitwarden-2024.5.0-amd64.deb 80326102 BLAKE2B ec8e9ae52bb5dcddc8b0d6e34f18174a304766639300ef2b601c4b5c62b4fa8f2d79e38b7a383e20aee9eb45a3af24ff54d7926ca051d5f1ea3b92861539dff3 SHA512 1f54757c74e438e556c512b5b96f08b758924248aea495ef87e2e408895f05970f2a46627ef421f23d659d50510216dcecca774f4a0fd34ee87cd10bed1e1f98
-EBUILD bitwarden-desktop-bin-2024.2.0.ebuild 1689 BLAKE2B 80d621cf295463043cbf79341d07dbb18f8e659bd866901ad6c208495dfc6e84904aa96a104ebb710183a6355412c66918a59e9065fa3edbc4e148950ce109b6 SHA512 378dd06d8917e0f61dc9d55ac9bb02ebd8951783dcfce56d0b502fa766208451e6abf2e111d6bd83de3ff8ec7b4e8b506337aecbd3e8a41753a65d39e4692180
-EBUILD bitwarden-desktop-bin-2024.3.0.ebuild 1689 BLAKE2B 80d621cf295463043cbf79341d07dbb18f8e659bd866901ad6c208495dfc6e84904aa96a104ebb710183a6355412c66918a59e9065fa3edbc4e148950ce109b6 SHA512 378dd06d8917e0f61dc9d55ac9bb02ebd8951783dcfce56d0b502fa766208451e6abf2e111d6bd83de3ff8ec7b4e8b506337aecbd3e8a41753a65d39e4692180
-EBUILD bitwarden-desktop-bin-2024.4.1.ebuild 1689 BLAKE2B 80d621cf295463043cbf79341d07dbb18f8e659bd866901ad6c208495dfc6e84904aa96a104ebb710183a6355412c66918a59e9065fa3edbc4e148950ce109b6 SHA512 378dd06d8917e0f61dc9d55ac9bb02ebd8951783dcfce56d0b502fa766208451e6abf2e111d6bd83de3ff8ec7b4e8b506337aecbd3e8a41753a65d39e4692180
+DIST Bitwarden-2024.6.0-amd64.deb 80663126 BLAKE2B 70855af5b213fee1c8d64f59ba22bd122031070b1fc88d688b2554b223d5b955026c81d54316d30f8b004c0ce098ba493a4deebd93061305184b0aea939df1d2 SHA512 8c88464f0e2281ff44d91ee0da85caaa6f99d3e7d37eab4961c4bd67eaf462a73a0e40d50cc11061d90468d360d42bf5194435e3f11cf71d824f26f69860e573
 EBUILD bitwarden-desktop-bin-2024.5.0.ebuild 1689 BLAKE2B 80d621cf295463043cbf79341d07dbb18f8e659bd866901ad6c208495dfc6e84904aa96a104ebb710183a6355412c66918a59e9065fa3edbc4e148950ce109b6 SHA512 378dd06d8917e0f61dc9d55ac9bb02ebd8951783dcfce56d0b502fa766208451e6abf2e111d6bd83de3ff8ec7b4e8b506337aecbd3e8a41753a65d39e4692180
+EBUILD bitwarden-desktop-bin-2024.6.0.ebuild 1689 BLAKE2B 80d621cf295463043cbf79341d07dbb18f8e659bd866901ad6c208495dfc6e84904aa96a104ebb710183a6355412c66918a59e9065fa3edbc4e148950ce109b6 SHA512 378dd06d8917e0f61dc9d55ac9bb02ebd8951783dcfce56d0b502fa766208451e6abf2e111d6bd83de3ff8ec7b4e8b506337aecbd3e8a41753a65d39e4692180
 MISC metadata.xml 323 BLAKE2B 3f1affe8fb7b242a0ea072faaebcccd37bf005ee68c7519857701c37fe6a11b0dffe1692af141b54218367ee8c8361cb0e6608621453d424d52b061b569563d1 SHA512 95ab28dcb844ac6d2ba4573699e86a4c303aa46b4c2eddf1273ecf37a3bbb751b9a478b535fbdcbc12424bc4f826b4b0781cfb8079e5563ed41f12ce68b35908
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild
deleted file mode 100644
index a98f129ada65..000000000000
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.3.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop unpacker xdg-utils
-
-MY_PN="Bitwarden"
-
-DESCRIPTION="Bitwarden password manager desktop client"
-HOMEPAGE="https://bitwarden.com/"
-SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/wayland
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-"
-IDEPEND="
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-"
-
-QA_PREBUILT="
-	opt/Bitwarden/*.so*
-	opt/Bitwarden/bitwarden
-	opt/Bitwarden/chrome-sandbox
-	opt/Bitwarden/chrome_crashpad_handler
-"
-
-src_install() {
-	insinto /opt
-	doins -r opt/${MY_PN}
-	fperms 755 /opt/Bitwarden/bitwarden
-	fperms 4755 /opt/Bitwarden/chrome-sandbox
-
-	domenu usr/share/applications/bitwarden.desktop
-
-	local x
-	for x in 16 32 64 128 256 512; do
-		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
-	done
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild
deleted file mode 100644
index a98f129ada65..000000000000
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.4.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop unpacker xdg-utils
-
-MY_PN="Bitwarden"
-
-DESCRIPTION="Bitwarden password manager desktop client"
-HOMEPAGE="https://bitwarden.com/"
-SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
-S="${WORKDIR}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/nspr
-	dev-libs/nss
-	dev-libs/wayland
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxkbcommon
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-"
-IDEPEND="
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-"
-
-QA_PREBUILT="
-	opt/Bitwarden/*.so*
-	opt/Bitwarden/bitwarden
-	opt/Bitwarden/chrome-sandbox
-	opt/Bitwarden/chrome_crashpad_handler
-"
-
-src_install() {
-	insinto /opt
-	doins -r opt/${MY_PN}
-	fperms 755 /opt/Bitwarden/bitwarden
-	fperms 4755 /opt/Bitwarden/chrome-sandbox
-
-	domenu usr/share/applications/bitwarden.desktop
-
-	local x
-	for x in 16 32 64 128 256 512; do
-		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
-	done
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.2.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.0.ebuild
index a98f129ada65..a98f129ada65 100644
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.2.0.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2024.6.0.ebuild