gentoo auto-resync : 29:01:2024 - 12:57:49

11 files changed, 15 insertions, 471 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index dfbc3c69dc9c..72a29e2aea0e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 1aeb20c12b1a..6f4b5eb1db07 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,17 +1,7 @@
-DIST aws-cli-1.32.14.gh.tar.gz 2622299 BLAKE2B 0b7a29c756c2bdccc6bb5ef4953c2f05db05c2929c2671fc8b24cf410272b4bd1a25262f34b40db658a0e7921aae933d92b34be011832558ed286966f7473f2f SHA512 e7847d63337cbcc10a62fc5b36aa4ed32b89de0c22116f8b1a618387f4d6308a9df8bba2b6e0353cf9af39e69c32e168515461c867c3141a29846b5f9fc6ad7e
 DIST aws-cli-1.32.18.gh.tar.gz 2626034 BLAKE2B 3d60094c5b6e70f8df57ada95e269cb710975b36724eadc2fcac07733099a8bf063e7198cd90af382e3a8480ad6d173143daed3e03b5c18a529a1b3227d3126f SHA512 ab161193d52c21751fe3515eae1182adeb23a6d8198d85e922674c6af6a64c4efb68975a38a5ec36957eb62350437b5e3d6a6b9c36dc4a6b4ae4bebc4d92fdf6
 DIST aws-cli-1.32.23.gh.tar.gz 2627296 BLAKE2B b85f77efb7e7f9fac19fc342bcef44def80de24ec7ce50157fc06b0db6c3e0726c21ffcd13861d11170745d76e15e8f54d4d3ec030b4dea93d882b31a9aa38b2 SHA512 b566af885a980a74e159bd41ec4dbb94af87a5a43f4c07845c98ce60762bf33f2770c46a290f95102819da7266bb59040fbb4c7d92422c32f6e1a0b7bfa6f5cf
-DIST aws-cli-1.32.25.gh.tar.gz 2628727 BLAKE2B a7058ac75a3c2952c03f0a70faf87b53587c108b28109114c66a5232a4a59f856ee7a49c8058a6b8d08ddfebdf86f5bc6a79fd43a4397663c75163013fb50608 SHA512 68882310a1cb2202522ffb559e9ae5e72fcff0dd5bcd130a2df2df0698e510e05d9763f618c506d1c3990b51cbde9f6186633b4cfb970f799994b43da0f03946
-DIST aws-cli-1.32.26.gh.tar.gz 2629020 BLAKE2B 4e493e46ee004bf97be65733f28382a81f737ee30182e22328c20e48e9cd1106ca391c98d18b883739520d73089602d1a4c559e6af4b61ea4d5ea4157e9f1081 SHA512 1f02c53517593ced7ab18d71b6d5eab6fd68673169032b6540acb3675c413aa6047cdbf427d595c2bf4df8eb9575d3455a50be3c7906d06bafa12e627781469a
-DIST aws-cli-1.32.27.gh.tar.gz 2629131 BLAKE2B cd29f4fae8ef9bdc39bb2737649123ddc65195eef642ca511a9de5c0f8530833efa8bbd8da0ca14dded088fe8ed662a058188aea2fba290f88a1f0c89a678fb4 SHA512 68af10e6beadf7454dfbed51d78ed5792b22b9a7755019b300f64c6a5c9bf7dd1be1649f5cea1d2368811d2b5b18cd8bdb511c18b67f4775c37717ce9bd5d3ee
-DIST aws-cli-1.32.28.gh.tar.gz 2629237 BLAKE2B c4f22e46952ec260b43dfca2d22780dd10cee6dd6eed8fcf1ad113ec8f20b81de94a4f3d61d0986757ef55077531423b29d884724135bdbd565cce2e1a5173dc SHA512 c8cc9db5a2f17b8191cdb4be258fc739c8ef2d8ce1360d3740f20ea091b5eee1e332445d69159ed6a995783c3cb8641598b3f04a43a9d610c123c7ba612fadf9
 DIST aws-cli-1.32.29.gh.tar.gz 2643387 BLAKE2B 0d07a5478c5a51baf743c97aa613611aee9e84d569af1ae62e0adde56229f2973d17490a9ae287a713c2b8e54149674d416c12b5387f87504d3d1c5133a26789 SHA512 221315ab814691dc7cdcdee3fbe702275ad85dde50313249ccd57904d5bdd3266295eed885c7e80228970e04af240dbdfa7f3303c8a84d39633575cd0a579f81
-EBUILD awscli-1.32.14.ebuild 2864 BLAKE2B 5bf1ffd344887c79c3e7baf37dfd7a00bac095342f0128d71407661ecd248843c2ec368ab0e7b7be0a7ff2c928faa01fa7c0eaad2163488752862f0cf6cd256c SHA512 eb2788ab3d268538d6a93a35d5f424cdfb6b69f5858c8ec1cbf91a3a7134f40aeabf5514cde51c81842646b795051a6cceebb3c46a14fe32431029aa3451d4ff
-EBUILD awscli-1.32.18.ebuild 2871 BLAKE2B d3d947d0b8fcc7f665d3ae2f1456abf977b123e672a0ba9fa3282affc71e649efc073394b2f2e8023f0c0cf891e37737e62edbeead64c99c46ec7262ad1996fd SHA512 edbc32e9f407a678964dc09b002133a33b07143d07dade702075a0c498faf6563ca77b92e3d4d9d3f9b017d7073ed8237f8c6cd89d2ee3c27033393d2b4b1e3a
+EBUILD awscli-1.32.18.ebuild 2864 BLAKE2B 5bf1ffd344887c79c3e7baf37dfd7a00bac095342f0128d71407661ecd248843c2ec368ab0e7b7be0a7ff2c928faa01fa7c0eaad2163488752862f0cf6cd256c SHA512 eb2788ab3d268538d6a93a35d5f424cdfb6b69f5858c8ec1cbf91a3a7134f40aeabf5514cde51c81842646b795051a6cceebb3c46a14fe32431029aa3451d4ff
 EBUILD awscli-1.32.23.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
-EBUILD awscli-1.32.25.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
-EBUILD awscli-1.32.26.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
-EBUILD awscli-1.32.27.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
-EBUILD awscli-1.32.28.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
 EBUILD awscli-1.32.29.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.14.ebuild b/app-admin/awscli/awscli-1.32.14.ebuild
deleted file mode 100644
index bbe11eaa3e58..000000000000
--- a/app-admin/awscli/awscli-1.32.14.ebuild
+++ /dev/null
@@ -1,88 +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/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/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.18.ebuild b/app-admin/awscli/awscli-1.32.18.ebuild
index 390708df2335..bbe11eaa3e58 100644
--- a/app-admin/awscli/awscli-1.32.18.ebuild
+++ b/app-admin/awscli/awscli-1.32.18.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.32.25.ebuild b/app-admin/awscli/awscli-1.32.25.ebuild
deleted file mode 100644
index 18c949df1583..000000000000
--- a/app-admin/awscli/awscli-1.32.25.ebuild
+++ /dev/null
@@ -1,89 +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/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.26.ebuild b/app-admin/awscli/awscli-1.32.26.ebuild
deleted file mode 100644
index 18c949df1583..000000000000
--- a/app-admin/awscli/awscli-1.32.26.ebuild
+++ /dev/null
@@ -1,89 +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/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.27.ebuild b/app-admin/awscli/awscli-1.32.27.ebuild
deleted file mode 100644
index 18c949df1583..000000000000
--- a/app-admin/awscli/awscli-1.32.27.ebuild
+++ /dev/null
@@ -1,89 +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/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.28.ebuild b/app-admin/awscli/awscli-1.32.28.ebuild
deleted file mode 100644
index 18c949df1583..000000000000
--- a/app-admin/awscli/awscli-1.32.28.ebuild
+++ /dev/null
@@ -1,89 +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/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/usbview/Manifest b/app-admin/usbview/Manifest
index d78179c5d97b..495c85eebcd7 100644
--- a/app-admin/usbview/Manifest
+++ b/app-admin/usbview/Manifest
@@ -1,5 +1,5 @@
-DIST usbview-2.2.tar.gz 378077 BLAKE2B 85edd8b4e7a36e6be4402024c4e4eb04ad28a1f402011ddb9e7a5182e8af02e3c4e01713e0d93c85d9eb61d1d70fd08b9292592975956b54eb40a37c2ad38dd1 SHA512 07684667310a9e073de05d4cb14a56370e72d4c1a2a81038331d7e0f5a546c65cb0cacedc6117702c116bb5863551f6ae730b4a9e6313d45fb052c9ce7823d16
 DIST usbview-3.0.tar.gz 375159 BLAKE2B 3c95e8c1e37c7209f086206305ab22ff7d26868e8b5eeae07111c82f5bc60eccf8d4ba4021cb57d2d299775f6a4ca7c006ebbf41b7ce24baa7b976cab976b565 SHA512 65cfc933eac44e83df48ebc79e9eb85db64f817b9c09b708ba06471d7845ac575cdec1a4a06a5792cb2b8d80b046dadc118200c455a350300b0285b80221aac5
-EBUILD usbview-2.2.ebuild 622 BLAKE2B 7c9df6d191229718560910cdc4c20088239027e2d9d5ed4dabd269577d17428264062548b1853a20fdc4b02cd825ce1d76b4d6a85b3fad6a4c0d12fa7367fcb8 SHA512 b95a7ac8c19aee8e810e6e934a970d9d8381201b578096e28ee731027d3ce2ab233151925b7f9891423b397f3a3e4d87400f1a0fd13e0dee794a50154c381a53
+DIST usbview-3.1.tar.gz 374228 BLAKE2B a0836049c8075831a5fc2c19532870478ea610ba9616d9809a25f6ca39c53e40695f134e794d378d4259dc102fa50e7f730c9bdc00558db1342694e6cc117cad SHA512 edc60d9543e5ebb377d4d1e71b8ca83d055cee9c12270a4d189a19503c12c8574103637fd6b9a13741c6dc9375a80c7c57daf4d6ccf0520d55e843e07be09479
 EBUILD usbview-3.0.ebuild 626 BLAKE2B 5406d13ad3d124dc973945da71cbcf3d8094f70cef0ca7fb5919cb79b4d05eb744149bbf0fa0aff7b00166996cfb36b90fd2d4bf43d8d31b0c48fec6b6cbbf3b SHA512 3eb861bf4da311738791c73dda654c75978e374d1eb42828e1252f59ffefbade079166fd4062b29b146e15025789b4004c9b1df22987ba897e20c86f44afbd4e
-MISC metadata.xml 247 BLAKE2B 5e7c61d46e194f2b71c9d1f20584db24b727292f73aba3fba23f9a3b4519e9656428f7577e55b1f22ca9267e84952c8334fd058e8d0b32547264081edfd2badf SHA512 2737646bd6d9a8b0b7c16d7f18853e86298bacff07c90c561c61afd7a2401aa5068dac76d4a958bec643e39097317672252b6099199466bff14e15b240464db7
+EBUILD usbview-3.1.ebuild 590 BLAKE2B 58b37e6813ca9aed616f1f96fc5c7e2843b728de9599392d1d0ad5a0ce45be35b41027b7f16d0e4fa001c9f196ab977061310288ee3660de7beacbd6faa25143 SHA512 bd45705b8480009be2440f3581788bc66570fc0aded567858dbcd8b8344d18ff3c11cc6b6599aa752404f350a26fbead3fa1d5e40c008708210244eb1b2517a4
+MISC metadata.xml 324 BLAKE2B f3d8da70475aa495eb454cf7b3aa9a009c03d120001399d0e0ccd2ebe9caed3e0aa1b6a00bb1aeb078ac513950eaa6bf932bd9f7776c327529ecfd5775ba391d SHA512 137602091b0ce20dbac313377487638a32b608c8aa8066e6cdb9767298f76b0120191c0d5002d56fc4cddc7128f71978e6d8270441c3b01e7878d15108212c38
diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml
index 5184cee2ce40..d4b9dfd24c64 100644
--- a/app-admin/usbview/metadata.xml
+++ b/app-admin/usbview/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">gregkh/usbview</remote-id>
 	</upstream>
diff --git a/app-admin/usbview/usbview-2.2.ebuild b/app-admin/usbview/usbview-3.1.ebuild
index 15b921b80152..84120651b862 100644
--- a/app-admin/usbview/usbview-2.2.ebuild
+++ b/app-admin/usbview/usbview-3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit linux-info
+inherit linux-info xdg
 
 DESCRIPTION="Display the topology of devices on the USB bus"
 HOMEPAGE="http://www.kroah.com/linux-usb/ https://github.com/gregkh/usbview"
@@ -11,20 +11,15 @@ SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-libs/glib:2
 	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-"
+	x11-libs/gtk+:3"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/imagemagick-tools[png,svg]
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
 
-pkg_setup() {
-	CONFIG_CHECK="~DEBUG_FS"
-	linux-info_pkg_setup
-}
+CONFIG_CHECK="~DEBUG_FS"