gentoo auto-resync : 23:03:2025 - 00:31:41

15 files changed, 265 insertions, 431 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d3dd9e0aac18..da9b50fbc18f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 557d36b9718e..ef8f485b67ef 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
 DIST aws-cli-1.38.13.gh.tar.gz 2932854 BLAKE2B 197168721c41d0d79342dbf03892dd48fab2dd64bf97abffea70c7ca2a06fb79211a7a5284f680ca537a1b9330537ca0d78c5d86f6add6954db59e72a82f59e0 SHA512 d6d35aa2c6163e8d2fffd81b54f029181128894a75b47a62ab84af3e96b031a930b66568f83b3a21b8cc50c75644a223641ed9166a4814ff824f946136c374a0
-DIST aws-cli-1.38.14.gh.tar.gz 2933092 BLAKE2B d1550d891dc243138e593483ce7306286846d7821c92904839e82f4391b0cc3310f22942a24d750072e6e64000fa0f240b7b92333eeb702b32814d99df6b8b7c SHA512 367965d619ea852fff66ce20e3dfcf8fd2eb5e823eda96c212d9626e66e6ec85b0546ad5f66a8652b9cfdfae69a04600a570ffade25658898f8817723840482b
-DIST aws-cli-1.38.15.gh.tar.gz 2933057 BLAKE2B 7dbc2d1585ccb4aff946914ce55bf668278c4d305dabe40ea80669cf4eb75999837a10025b8cd35fc3d9405ceffece97ff3277854a28ce66553f4816da6a9b40 SHA512 234ed8a39649569601e060267166e59bc11d27429cd49abb3dcb4545ee212b5a66116243ec802a0b0c2112d8766ad823786b0b93d8899cb7af4d77dadbe17997
-DIST aws-cli-1.38.16.gh.tar.gz 2941536 BLAKE2B 0fd403873f7ae6631f7be3c02117a3e26ec9f4c8b9a460684d4a0c37a1143c3ebbfd36156332152dd7b87dd1c633c137cbecfaaf8b6beb397feb8911545b0eef SHA512 f0260f88f9cd3f6d499cd3e42db7f59bd1a2cd9aa4d25ee73048dd17ca0c9de27fca0a0206ab9b0fc88f8789f3aa2a202c501b633af7b8115cec454138d6fe63
-DIST aws-cli-1.38.17.gh.tar.gz 2941746 BLAKE2B 4ef7d61e2c3d8eeeacaaa1b8ea7f9d1ccd381b7cb9f7be2e7b918abb52e2f546718afbe1f7956f7f97ea0e0738c39e2aefa0ed18188001116f66400ae36c14e2 SHA512 f28061ccde30a98e3732ef654bf98867789c0ed750608b1bc613040be8e3226945213be1296df015f7940e72ad6d1a2339b843e9518d18e02458453869e2d459
-DIST aws-cli-1.38.4.gh.tar.gz 2908307 BLAKE2B 1dbae7f032e920b950cedaa5223692c88262b32af1fbd7cd5459110e6d987182bb321a2e689d2ba0b74757faa3d5dc8602480fd735ac227de1cf1975414019a8 SHA512 5c255d7b9cd63c49255b53e66f0800d1c7e03a68c18dd11f23f13d3a60dc06ac868f334cf3b1b29ece0cf0f458862a568283729f320bd0095211fc9fac0e7024
+DIST aws-cli-1.38.18.gh.tar.gz 2942596 BLAKE2B 263926ed648f37eca2b1376ad26ac25c5c6d82182c5a3ce0c3511c7b6ba2958db5e6a09c5d4e7fcc702515240b30e4cec952f9f3d47f7d7dcfe5b1078fd3217e SHA512 4cc5eb7e7e1f5c81b7cfe96c09b5996fb8d2148d7b8352a9bbafb9d162fb6b60b58450c7dc0fb717e779928c2d708fa4538cb4e2c6cf6fb33d5e52952d18472f
 DIST aws-cli-1.38.9.gh.tar.gz 2921470 BLAKE2B fb6b616095702417335be03a763a4434759c79fa1a31ec7c8c84cb59567461167b0b3c5b80baa950cd0b7298985b298c825f669b82d33ef5bd35adefe947729c SHA512 23fd65c3a0b0c8bb0cd64d52db924cddc8663671c0d80e45c9af1afb2c8558e42eed7a88d3fba2351fa1cf2d0dda1ca1b51a3baaba04b5249bd5d1551059b100
 EBUILD awscli-1.38.13.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
-EBUILD awscli-1.38.14.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
-EBUILD awscli-1.38.15.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
-EBUILD awscli-1.38.16.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
-EBUILD awscli-1.38.17.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
-EBUILD awscli-1.38.4.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f
-EBUILD awscli-1.38.9.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
+EBUILD awscli-1.38.18.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
+EBUILD awscli-1.38.9.ebuild 3124 BLAKE2B 035e52b252c6e82be66ce01b02bb77556580162f4679e628c77be32fd256544ddc06781caae30bb763f949425b2545930c7704ebc509dd72588838834818bfdb SHA512 6297f03f60237a835600d4c3206600f833d1b013221ca349636360822b5d5bdb65a06a612070838605e70ad23b4bfd948461a113f63e4de106e6f8d35fb8e677
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.38.15.ebuild b/app-admin/awscli/awscli-1.38.15.ebuild
deleted file mode 100644
index 88651d723a58..000000000000
--- a/app-admin/awscli/awscli-1.38.15.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2025 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 distutils-r1 shell-completion
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-	newzshcomp 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.38.16.ebuild b/app-admin/awscli/awscli-1.38.16.ebuild
deleted file mode 100644
index 88651d723a58..000000000000
--- a/app-admin/awscli/awscli-1.38.16.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2025 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 distutils-r1 shell-completion
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-	newzshcomp 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.38.17.ebuild b/app-admin/awscli/awscli-1.38.17.ebuild
deleted file mode 100644
index 88651d723a58..000000000000
--- a/app-admin/awscli/awscli-1.38.17.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2025 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 distutils-r1 shell-completion
-
-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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-	newzshcomp 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.38.14.ebuild b/app-admin/awscli/awscli-1.38.18.ebuild
index 88651d723a58..88651d723a58 100644
--- a/app-admin/awscli/awscli-1.38.14.ebuild
+++ b/app-admin/awscli/awscli-1.38.18.ebuild
diff --git a/app-admin/awscli/awscli-1.38.4.ebuild b/app-admin/awscli/awscli-1.38.4.ebuild
deleted file mode 100644
index 2bb0ee1db5bd..000000000000
--- a/app-admin/awscli/awscli-1.38.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2025 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
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(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.11.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[@]}"
-
-		# flaky (some ordering?)
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-	)
-	# 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.38.9.ebuild b/app-admin/awscli/awscli-1.38.9.ebuild
index 88651d723a58..dd11bada3942 100644
--- a/app-admin/awscli/awscli-1.38.9.ebuild
+++ b/app-admin/awscli/awscli-1.38.9.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
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(ver_cut 3-)"
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 5fe81f8b56db..d3edf0667e3a 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,3 +1,5 @@
 DIST conky-1.22.0.tar.gz 2030830 BLAKE2B b262b76fac24d74db0fe099e6e1c54be463d9453c5e9bcb9de33beeccda9e7b063287c189018f673bf0fc1d46029de9ac4f6c333c579b3f7fc86e2a7866e761e SHA512 df110bbec225127b6b9e2cb8998a21d99beb00225c7df6a6d35d6758135c8882d3e06c796f5c94eec7653da73af32f7a87ae631755b0e715306799f89de63cdd
+DIST conky-1.22.1.tar.gz 2024889 BLAKE2B 1ff146cc32eed208452c0b7451b9e9afb7b3d4211c4149beb1dea0809d66a38e6318749cb81cf0914f654367f1fe695fcbec92f5eae17f6170d4341a6aa365b7 SHA512 1a15738596b32f128152b8b04f7184a6e75c151c96f209d59f188f955f11131350d9876bd7c930a8e46d72151ba1caa5328db75d4f366d1df90c1b998c65c574
 EBUILD conky-1.22.0.ebuild 6189 BLAKE2B fff5c99acc6a1cdbc8b818628a90bdb855506cb2368f118c5ad998a86dfc97126c6c73e36bef06bb547541698fd8545a53a57ed47a3e395ff626c46945de2df0 SHA512 c1c2f527fb184197036645f13316aba5f28d2d733549d3c875d991098f31790c956bf423c759cd68322e597c3968eba50bfc1a5fbcce4a281dae53a4dcc1ec82
+EBUILD conky-1.22.1.ebuild 6193 BLAKE2B 121e23a4eb7ba66f96f23526a965c9cb7f8b6c7734aa6c0b742903e1c8be2661e7bc2d7149c32e5e9841a2ff0a556a7d15f4134232a98bd34e918f13d12c635f SHA512 854c19d40d17d9fc4949cb448ffc7e321a0e751e0e0e660dee7533cd2c7e20fde39e5f95df217dc35161d667043f8e68adcf2e6ce8695f5f4e24b573ffbc15e4
 MISC metadata.xml 2706 BLAKE2B ccd856ef7d804a1d4cea72124dc575dc3b94b6cad0b98b4bff8248f70f84b1705d862a58b0c98d1a67ea17c412e7d967a32d31678e8b51d5234c215d54389a57 SHA512 65bd968350ff45ed491a2cc36bb7d5640e38f3a4b4a0e0e3fe22d4e74563c2bf2a3d9f3cd9f3c67a0e9f8b756c387f72fcf8581c6876941112470f7f04e47ddf
diff --git a/app-admin/conky/conky-1.22.1.ebuild b/app-admin/conky/conky-1.22.1.ebuild
new file mode 100644
index 000000000000..3d106fec1f7d
--- /dev/null
+++ b/app-admin/conky/conky-1.22.1.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-4 )
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit cmake linux-info lua-single python-any-r1 readme.gentoo-r1 xdg
+
+DESCRIPTION="An advanced, highly configurable system monitor for X"
+HOMEPAGE="https://github.com/brndnmtthws/conky"
+SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3 BSD LGPL-2.1 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apcupsd bundled-toluapp cmus colour-name-map curl doc extras hddtemp ical
+	iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
+	lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia
+	+portmon pulseaudio rss systemd test thinkpad truetype wayland webserver
+	wifi X xinerama xinput xmms2"
+RESTRICT="!test? ( test )"
+
+# Note: toluapp is bundled in conky since 1.11.2
+# Note: maintainer mode "-DMAINTAINER_MODE=yes" sets CMAKE_BUILD_TYPE Debug
+#       which creates debug symbols and enables "-DBUILD_TESTS" which also
+#       results in conky_core debug library getting installed
+
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	ical? ( dev-libs/libical:= )
+	iconv? ( virtual/libiconv )
+	imlib? ( >=media-libs/imlib2-1.11.0[X] )
+	irc? ( net-libs/libircclient )
+	lua-cairo? ( x11-libs/cairo[X?] )
+	lua-cairo-xlib? ( x11-libs/cairo[X] )
+	lua-imlib? ( >=media-libs/imlib2-1.11.0[X] )
+	lua-rsvg? ( gnome-base/librsvg )
+	mysql? ( dev-db/mysql-connector-c )
+	ncurses? ( sys-libs/ncurses:= )
+	nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
+	pulseaudio? ( media-libs/libpulse )
+	rss? (
+		dev-libs/libxml2
+		dev-libs/glib:2
+	)
+	systemd? ( sys-apps/systemd )
+	truetype? (
+		x11-libs/libXft
+		>=media-libs/freetype-2
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/pango
+	)
+	wifi? ( net-wireless/wireless-tools )
+	webserver? ( net-libs/libmicrohttpd:= )
+	X? (
+		x11-libs/libXdamage
+		x11-libs/libXfixes
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libX11
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xmms2? ( media-sound/xmms2 )
+	${LUA_DEPS}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	apcupsd? ( sys-power/apcupsd )
+	cmus? ( media-sound/cmus )
+	hddtemp? ( app-admin/hddtemp )
+	moc? ( media-sound/moc )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-cpp/catch
+	)
+	wayland? (
+		dev-libs/wayland-protocols
+	)
+"
+BDEPEND="
+	colour-name-map? (
+		dev-util/gperf
+	)
+	doc? (
+		virtual/pandoc
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja2[${PYTHON_USEDEP}]
+		')
+	)
+	extras? (
+		$(python_gen_any_dep '
+			dev-python/pyyaml[${PYTHON_USEDEP}]
+			dev-python/jinja2[${PYTHON_USEDEP}]
+		')
+	)
+	wayland? ( dev-util/wayland-scanner )
+"
+
+python_check_deps() {
+	use doc || use extras || return 0
+	python_has_version -b "dev-python/pyyaml[${PYTHON_USEDEP}]" &&
+	python_has_version -b "dev-python/jinja2[${PYTHON_USEDEP}]"
+}
+
+REQUIRED_USE="
+	${LUA_REQUIRED_USE}
+	imlib? ( X )
+	lua-cairo? ( || ( X wayland ) bundled-toluapp )
+	lua-cairo-xlib? ( X  bundled-toluapp )
+	lua-imlib? ( X bundled-toluapp )
+	lua-rsvg? ( || ( X wayland ) bundled-toluapp )
+	mouse-events? ( X wayland )
+	nvidia? ( X )
+	rss? ( curl )
+	truetype? ( X )
+	xinerama? ( X )
+	xinput? ( X )
+"
+
+CONFIG_CHECK="~IPV6"
+
+DOCS=( README.md AUTHORS )
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="You can find sample configurations at /usr/share/doc/${PF}.
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf and edit it to your liking.
+
+There are pretty html docs available at https://conky.cc/.
+
+Also see https://github.com/brndnmtthws/conky/wiki or https://wiki.gentoo.org/wiki/Conky"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	lua-single_pkg_setup
+	if use doc || use extras; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# pin lua 5.4
+	sed -i -e 's|Lua "5.3" REQUIRED|Lua "5.4" EXACT|g' \
+		cmake/ConkyPlatformChecks.cmake || die "ConkyPlatformChecks.cmake"
+
+	cmake_src_prepare
+	xdg_environment_reset
+}
+
+src_configure() {
+	local mycmakeargs=()
+
+	if use X; then
+		mycmakeargs+=(
+			-DOWN_WINDOW=yes
+			-DBUILD_XDAMAGE=yes
+			-DBUILD_XFIXES=yes
+			-DBUILD_ARGB=yes
+			-DBUILD_XDBE=yes
+			-DBUILD_XSHAPE=yes
+			-DBUILD_X11=yes
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_X11=no
+		)
+	fi
+
+	mycmakeargs+=(
+		-DBUILD_APCUPSD=$(usex apcupsd)
+		-DBUILD_AUDACIOUS=no
+		-DBUILD_BUILTIN_CONFIG=yes
+		-DBUILD_CMUS=$(usex cmus)
+		-DBUILD_COLOUR_NAME_MAP=$(usex colour-name-map)
+		-DBUILD_CURL=$(usex curl)
+		-DBUILD_DOCS=$(usex doc)
+		-DBUILD_EXTRAS=$(usex extras)
+		-DBUILD_HDDTEMP=$(usex hddtemp)
+		-DBUILD_HTTP=$(usex webserver)
+		-DBUILD_I18N=yes
+		-DBUILD_IBM=$(usex thinkpad)
+		-DBUILD_ICAL=$(usex ical)
+		-DBUILD_ICONV=$(usex iconv)
+		-DBUILD_IMLIB2=$(usex imlib)
+		-DBUILD_INTEL_BACKLIGHT=$(usex intel-backlight)
+		-DBUILD_IOSTATS=$(usex iostats)
+		-DBUILD_IPV6=yes
+		-DBUILD_IRC=$(usex irc)
+		-DBUILD_JOURNAL=$(usex systemd)
+		-DBUILD_LUA_CAIRO=$(usex lua-cairo)
+		-DBUILD_LUA_CAIRO_XLIB=$(usex lua-cairo-xlib)
+		-DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+		-DBUILD_LUA_RSVG=$(usex lua-rsvg)
+		-DBUILD_MATH=$(usex math)
+		-DBUILD_MOC=$(usex moc)
+		-DBUILD_MOUSE_EVENTS=$(usex mouse-events)
+		-DBUILD_MPD=$(usex mpd)
+		-DBUILD_MYSQL=$(usex mysql)
+		-DBUILD_NCURSES=$(usex ncurses)
+		-DBUILD_NVIDIA=$(usex nvidia)
+		-DBUILD_OLD_CONFIG=yes
+		-DBUILD_PORT_MONITORS=$(usex portmon)
+		-DBUILD_PULSEAUDIO=$(usex pulseaudio)
+		-DBUILD_RSS=$(usex rss)
+		-DBUILD_TESTS=$(usex test)
+		-DBUILD_WAYLAND=$(usex wayland)
+		-DBUILD_WLAN=$(usex wifi)
+		-DBUILD_XFT=$(usex truetype)
+		-DBUILD_XINERAMA=$(usex xinerama)
+		-DBUILD_XINPUT=$(usex xinput)
+		-DBUILD_XMMS2=$(usex xmms2)
+		-DDOC_PATH=/usr/share/doc/${PF}
+		-DMAINTAINER_MODE=no
+		-DRELEASE=yes
+	)
+
+	if use doc || use extras; then
+		mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use extras; then
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${S}"/extras/vim/ftdetect/conkyrc.vim
+
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${BUILD_DIR}"/extras/vim/syntax/conkyrc.vim
+
+		insinto /usr/share/nano/
+		doins "${BUILD_DIR}"/extras/nano/conky.nanorc
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	xdg_pkg_postinst
+}
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 2f631e610cff..b350680e4a8a 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,6 +1,6 @@
-DIST eselect-1.4.27.tar.xz 184464 BLAKE2B 718874f4d0651194f361ca3202e5140982812bf486c8efe82354944d55206b0113fa135992203e8baa00019c3fd773a90ddaf67157c16f4ac2d69965d9822fbd SHA512 f534785fc1f79869840f420b4ab2b2bf35593c504cce878a6d3d07f75012cf32288009ea9ac2a5607dba216a794110a64c5f2c54d5d8a3c641328489cecc024b
 DIST eselect-1.4.29.tar.xz 185948 BLAKE2B bb387a14c81d5ff5bf2e6e703465b24140b047f1464dee3c7fc0a125c9d94544a9afd801b42d2902dd6dee1af705f7dcfad854286d7e243a0f654cec35ab8eea SHA512 0466be2634f9d632d628cb11793d604002d989c222758ed33259c6b1dede80765d80f782242b22704e890bde84b2e1e3b3fb3d31574812cc803aad64ba8e7cf6
-EBUILD eselect-1.4.27-r1.ebuild 1623 BLAKE2B e726694e11f72453b340b7a70729ed7b2c03f0a51d80071936beb9b2f446713825aef826c3236c0133b3de7d1bb9c46fadca3055a0d0b9b21fc78f5a1feac11f SHA512 b913328169b23831ba3175f19b70996282764072f272b25274ae0316a8c07c2b0fe7e1c9bdc5569797f99dbfd6e33bfe3ccf9f5e3237455d3f36c7a75e279787
+DIST eselect-1.4.30.tar.xz 186060 BLAKE2B f58c2bdacfcb933aef2414e65866a4be33d02ddc42005770fd4f3200a7aa0437d31301ac35991309d51f2e95e8be2eafa0590600281801c6c63db08b3451b9ef SHA512 89ff9af40849e5d712716c35705e21bfc5d073536da8750566368d519d1b7de823575ffe730faabab4170ca773df31e7bb9d633d8e48361704102987c5d3e681
 EBUILD eselect-1.4.29.ebuild 1623 BLAKE2B 464d380122c9db74ef1ff0f9814772b2b3786fdd446157a903bbd31fd7f79de70fef5a04e9df5e0b015bae3daf448fbb181c9f95e2ce65e3f6a70cef416eda4e SHA512 8299e2828f6bbdbb158e26f889cfef027a7097aa7c0bd2c06752eaa7004e06e75fcba20d6cc1972e0044bb581e22582080925a188fd38ed9f8c3772dc72a46da
-EBUILD eselect-9999.ebuild 1389 BLAKE2B 5657bfdec0764b44159ddce806abf88f9b77e41cebcd0ff3f809f6678b0770ea48dc5f8cd267e34737aea4c8dd83e18dbc715d2ea65b0621a0ce5085efb92b81 SHA512 30134502391dd4e911a6a25f5fb1e1ccb7cffe7d70acf1629c2caec467a61dabd93604f247d37a2cf24dcd0d9f693c276b54d6ce0a48325738b64f2c1b0b166f
+EBUILD eselect-1.4.30.ebuild 1631 BLAKE2B f53e2821d133b0cc714608d464d9d8b7e8765b1df4cfc7618623cd9e5da1e4bc4680c86514ef087d7fbef848cc2291d94749d8335b717c72de6ea576fd9a0a84 SHA512 a98df52432cdaca09cac9e9bb661553d50a285dee2a0a3a5ec2d3fa47484d89649782b6ac14334174188a09d373195d40d03d35e63e1ac0951cf58bdcff8347a
+EBUILD eselect-9999.ebuild 1389 BLAKE2B 941cb82582661a51566822653af39c116d42c71a98cafa02c7cf2bc1ae51f7fca13eb43e23f6464fc78327324e15debd85a50c577544eadba60a0d43cd42c81e SHA512 839eb1a84ba7db9f130936af35a899b99d0b26ff8337948970ad9536221b6043412e045f1df0ddb3cb7b45f3f1232a0e572dd75356edb11c45cdcb44ed4ea656
 MISC metadata.xml 347 BLAKE2B 58c9ec8100f46cbb91dfcc6fc6f223e4d45553f401fe7312e36c0260c433a5842b07f894cef7dfd6c518ee5b664d86e3a4d434892ad3ea9c78c26c6f621e3063 SHA512 1963bcefd43ff52163c81a03bac522ca792688ff5317691ac30ec4375c6da4ebbf07f96da7bc1ecaa9554cee18c9f51f8b867e7e15bb652bdc7eee542f4a8d2b
diff --git a/app-admin/eselect/eselect-1.4.27-r1.ebuild b/app-admin/eselect/eselect-1.4.30.ebuild
index c1bd0738357f..e93a6fd25b05 100644
--- a/app-admin/eselect/eselect-1.4.27-r1.ebuild
+++ b/app-admin/eselect/eselect-1.4.30.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # Packages sharing a common release tarball:
 # app-admin/eselect
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc emacs vim-syntax"
 
 # coreutils for realpath
diff --git a/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
index 6c2f3d7252b2..d46994dfd7c8 100644
--- a/app-admin/eselect/eselect-9999.ebuild
+++ b/app-admin/eselect/eselect-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/eselect.git"
 
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index e57f572a26ae..a0528c58d588 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,10 +1,7 @@
-DIST stow-2.3.1.tar.bz2 556921 BLAKE2B cd946dd1537bec063e21c91cc60c0c8f3a8a5609960536020e7e4b970ff2daa628151258487492b1b44fb5539e1d75a8955152fdfbe91384b7e174ab420a9cf6 SHA512 3d6cec3d50e2dc0ffa92646c45015ced3fca32cef9dd24418fada3fc2e4472a1f335877debb3a1284812aef281a432925c3a3e7afa112d92f127facd3150079c
-DIST stow-2.3.1.tar.bz2.sig 833 BLAKE2B a236d67fca2dabb965021b7ef23ec680ffd48c1b23d3637cf4bd2c31da58b55ad9d190ee88c7f9bb8ce676f85a0bb133b963bc8252fea7c8d5bd5c0042c65681 SHA512 0a0ad10781c29ee6cd69dc8cb05592e779e5cb53412b8bc6c7bce12846c1e1480e2763eaaab329f2cf945a263d15217adb102387247bc2bec313856b3d7535c4
 DIST stow-2.4.0.tar.bz2 635343 BLAKE2B 578d3cf5084a97110eb90faed96d7ae1b167176795b7c4a3a65d5fc43a59983f5106fbb9d8ea136df92363e041f81c72483cd748cef9e051c2089795af53a6a6 SHA512 c479a0ba5d6af9a2a4860f4bf4095dbd586794e781766c22e6cda657bbf984915f4661e03825db02a300412aa49305e06b8107ffc96077bd64ba4e7a1eb27314
 DIST stow-2.4.0.tar.bz2.sig 833 BLAKE2B df8665e5d8189177138313de95ed1edcd1a38deca753f064cb9e6e1e5447c55467330c4d8f8ffefd05be12528788738e4ecd427db14bf36fdd070161b69a7422 SHA512 02bb9549a1d27c532f7dfbd42d5a6dcd92d0de7692f8e43c74ebd662c63e6cae656edc045379eb81e9908f88ee89100edd8b9fe416e4c13399357579c4836f66
 DIST stow-2.4.1.tar.bz2 650655 BLAKE2B 075b32fff4db357fe1311c68435bd8153f22f7d5f777dd94cbd19c426567a9a76c9b3be5371e2460b62454d42ef8d9cd16854efe64eab575a83ad74d53d78868 SHA512 e2317ceeafc2f165cf2b498491762ca1d81fc08fa9f8740712fc3127c95a3a4bf492528d2bdf45dcc497d97a4f8b29c50239874b52fde492775556ffd0562d98
 DIST stow-2.4.1.tar.bz2.sig 833 BLAKE2B 49a48913615bd29784019ec6406a22636214025211b287b949fb3fcd15244d3a8de7499ad0b87c9f6b46eee1bd1c460c518960cfd3b9b26c30a37ee12e578e32 SHA512 66cd8e98770c340e599ed3f5af3c55fbeb687ba6903d3cf00c4a68ee069f6628625f9b7d9cbceb6965c43f75523e98c8da6eae82f07bad7d3d5354b3a8402e89
-EBUILD stow-2.3.1.ebuild 900 BLAKE2B 94bf4542b2fd8b1d9efad974f05429029fe105ca125c33db333dd7e968034d9d358a16b2bc5cc5540d41427b050c36388db94476af181ca95119666ae0c1cb7d SHA512 1d8b134e26469f13b70617c5c2b05787f4a106bb5d68f82a87d35afbf62ceaa3c59435b45a95d745e98ef1fe322ca1585910a702c3c4b3a3d864d0a545277e03
 EBUILD stow-2.4.0.ebuild 900 BLAKE2B f5ee91a9ccb9d816710e4cc6db004fc55dd33ddf0b3261e780812d3332851c359cf60c5277522ae0290676e412d6939d877dcfa3363f0ee2fe8fa5321fa21dbb SHA512 200b6c5986a05f2696949606e12de4e2e1667cd2604a97193424c1a847095ec312e84b112596974fd3d06d83729db4f727b3501dedb19329012654b8551e6c6a
 EBUILD stow-2.4.1.ebuild 900 BLAKE2B f5ee91a9ccb9d816710e4cc6db004fc55dd33ddf0b3261e780812d3332851c359cf60c5277522ae0290676e412d6939d877dcfa3363f0ee2fe8fa5321fa21dbb SHA512 200b6c5986a05f2696949606e12de4e2e1667cd2604a97193424c1a847095ec312e84b112596974fd3d06d83729db4f727b3501dedb19329012654b8551e6c6a
 MISC metadata.xml 321 BLAKE2B 6c48c1b0f2712dfe4d98286b1056b52315800609ddb3a17d7b6c13f582a09af037d3a559b735b9d986beb30144423effa66e0aa9d43b0505d6e8777d90b6ae2d SHA512 9f9ffbbde5faad7037655d2269cc5b857a5aab45fe01444292cb56d8d38c278a487c93c192753de72afba2589f299337c8ef71c180df80cae56bad3c2c3dd786
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
deleted file mode 100644
index 2c8d731bfc35..000000000000
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/adamspiers.asc
-inherit perl-functions verify-sig
-
-DESCRIPTION="GNU Stow is a symlink farm manager"
-HOMEPAGE="https://www.gnu.org/software/stow/ https://git.savannah.gnu.org/cgit/stow.git"
-SRC_URI="mirror://gnu/stow/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-lang/perl:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	test? (
-		dev-perl/IO-stringy
-		virtual/perl-Test-Harness
-		dev-perl/Test-Output
-	)
-	verify-sig? ( sec-keys/openpgp-keys-adamspiers )
-"
-
-src_configure() {
-	perl_set_version
-	econf "--with-pmdir=${VENDOR_LIB}"
-}