7 files changed, 99 insertions, 4 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index dc127c5aa238..a50f71e05e60 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index d11e9fe3fe90..dbc1b0d451f3 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.37.26.gh.tar.gz 2909650 BLAKE2B 77843b52fa77410c9568dcc402774352b839591264f16ce4b27c58f5b52fe159afe029756b702132c1b6e611f2e40d5a27f26d830928c2716ec285e58201ac16 SHA512 0396541bead54c81c9c9219403aa1d7dcf8f0a60b58d8ef33ff1900ae3d44cd362b4d0f2fdd93fee89a068bba1b5afefac44bcd8f5624368b2a02044acd070d9
+DIST aws-cli-1.38.10.gh.tar.gz 2921951 BLAKE2B b6392ed1190cba5494f12c7caff315e60f3d5b68cec4c0f322f82ba5cbfa9519d5c51ae0529afee48100b0cd6bd279bada67e6b98bbde3351dddc5263578290e SHA512 5cb618cacf08498da32dafd127a8385f69e16d45ca348cce918ed1ccf539f7c8fc7cf0a7ebd09de1f4f277bd60c74ef7bc64a1f56d515d994683402f02d436d6
 DIST aws-cli-1.38.4.gh.tar.gz 2908307 BLAKE2B 1dbae7f032e920b950cedaa5223692c88262b32af1fbd7cd5459110e6d987182bb321a2e689d2ba0b74757faa3d5dc8602480fd735ac227de1cf1975414019a8 SHA512 5c255d7b9cd63c49255b53e66f0800d1c7e03a68c18dd11f23f13d3a60dc06ac868f334cf3b1b29ece0cf0f458862a568283729f320bd0095211fc9fac0e7024
 DIST aws-cli-1.38.9.gh.tar.gz 2921470 BLAKE2B fb6b616095702417335be03a763a4434759c79fa1a31ec7c8c84cb59567461167b0b3c5b80baa950cd0b7298985b298c825f669b82d33ef5bd35adefe947729c SHA512 23fd65c3a0b0c8bb0cd64d52db924cddc8663671c0d80e45c9af1afb2c8558e42eed7a88d3fba2351fa1cf2d0dda1ca1b51a3baaba04b5249bd5d1551059b100
 EBUILD awscli-1.37.26.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f
+EBUILD awscli-1.38.10.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
 EBUILD awscli-1.38.4.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
 EBUILD awscli-1.38.9.ebuild 3131 BLAKE2B 8a61c4d672bc9bc67974d876f40ee63bd5c0c585be1325b849e84fde874754025abf8e865d1b23ffac3adacf23025902d5b1268dab87dbd622cf4485f959a4c0 SHA512 b59539df0de6cb7927d67e150c651c078cbf4f19415787abe6d8e27ef51c6c5a374f3df09aed35249bb9d00afb69ccc633fd070be45ee301c99ade2e454c30f0
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.38.10.ebuild b/app-admin/awscli/awscli-1.38.10.ebuild
new file mode 100644
index 000000000000..88651d723a58
--- /dev/null
+++ b/app-admin/awscli/awscli-1.38.10.ebuild
@@ -0,0 +1,93 @@
+# 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/entr/Manifest b/app-admin/entr/Manifest
index 14de68e9a95e..a8252371aef3 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,5 +1,5 @@
 DIST entr-5.6.tar.gz 23370 BLAKE2B 52b2e2d49d550c7ba82199cc70500598c50809136bc9bed881174ab59806802ac09cf7ff32f0476eeb66ee9fdb87bef72dbf28bfd4495f0301ee80809800dbfa SHA512 9c65449b6fd7e172fde23a6d4d776b6fdbcec210ef54234db0af056e481acd11f53f9b25432a278435943bd998be734fcd997b5debdcace58112ac99d103f653
 DIST entr-5.7.tar.gz 23587 BLAKE2B 497ac54042fd6d54f7c0f4401e2038d1f0f8e55277efb54389cd9c9635d2caf77e80d042456ac06cfe937ec88111cdebaaf8f6133cdddadcdb65d11442b9fe82 SHA512 a267fdc3a9aeb84823e14167a7aed32d682d200e72409f896e95aea3cb22e5185e1ee1c49726435d66953baae6444d49111e0c6a0af66895bdef0fccd3320446
 EBUILD entr-5.6.ebuild 711 BLAKE2B 78753c2decd36ba0eac8f1f479c1cd357c929dfba1e02f26b4e7efe1b10b30a1067fbb84076968a4668e745d0f83c45ec5dfc48b1d125266adcd9ce64113eeb7 SHA512 e29ea3a0a3d949e35350905f1008ab1314ed69ba654dce1da9871be14dba5a646a0b0ae089c43c1dc9055f11b677752552da4efddb29c2ff6ac250cb7c8ff26b
-EBUILD entr-5.7.ebuild 717 BLAKE2B c943fa308c023ee30288efc55f06e9af80b9c5060235c7a3e3426cdbb575f95e2a04fe4b229179da6770f0a69f3b69a6f778734ebc7354da83134d715a85d5f4 SHA512 9c84baf02a91fec8aa4612f7dc20b2f0001beb4a30023b1c1cd8468cbfac3435edba45038597b9609e4a6077b5af8029da881a46dc6bc1a2db2dea6e1774870a
+EBUILD entr-5.7.ebuild 711 BLAKE2B 87413869ee4621044a7658e5c3aa6c26b8dfa58dacbb9ed20b9190b92325e92cfa748634505c09556063d5dbd6acd5db4fefa691d591c5d7f90d87e2c8963152 SHA512 5173587774dc63b317fefd989a44f9da90ffcaf0d011bd35483e5bdfe12a92331779f07e9850f307a1df2ea0d8cf07e1371d7619bc9716e100bf1699e1a82ac4
 MISC metadata.xml 449 BLAKE2B 5a03f1f771985a3877ad95b143ae9959ed2850170880fe4af3b4319e50248faa99e11b8fdc9d59e608f398b8c93efcd2b7a15612df5a516256e8e6dfb61452c8 SHA512 4b6d9eb9a9bb61185b3da9ec12cf9584a26daa3cab3bcfaabcad057dd08cace027f348e4e2600dc306eae23be71c894bec7426ca872b1f7a0d341664bcb53721
diff --git a/app-admin/entr/entr-5.7.ebuild b/app-admin/entr/entr-5.7.ebuild
index 7a4e050a9262..f0d5cde701c9 100644
--- a/app-admin/entr/entr-5.7.ebuild
+++ b/app-admin/entr/entr-5.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://eradman.com/entrproject/code/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-admin/winbox/Manifest b/app-admin/winbox/Manifest
index 8199583d6216..9dcc72845f83 100644
--- a/app-admin/winbox/Manifest
+++ b/app-admin/winbox/Manifest
@@ -1,3 +1,3 @@
-DIST winbox-4.0_beta17.zip 23500419 BLAKE2B a13e6699a0059846be6fb5d3917ebfa299f967411b9bef144f5e295f0f687ac5d160babcb56b1c8f062e8a4421590c6de45d89715a2a543b8c8f435e65455270 SHA512 79669b35a78e7353ad3ab04f144acfd8c3722beb1df17e6ed7b7285f5a8059222a27dacdbdb31454570cc53da77f172305fe285e334d957d7606963efe2d57e1
-EBUILD winbox-4.0_beta17.ebuild 967 BLAKE2B 52813eaf091676afc288c26999a8e36bf0e58cf36895245a5b6bcd2505d45247ef59a7d422c923998c8876df42fde42d490134b6c675de38bc9697c80048c8e9 SHA512 23c6ea46fce3589717d1a6e2d763e7791f6fd759fb362948f2169bed2471e506fca90d607ae71d00a73e99073fa259b0a82088aff15f4491c073bc3c3cffde1c
+DIST winbox-4.0_beta18.zip 23507054 BLAKE2B 522d2e80fc9c9790a776121324472e8a682420af9e25c55d6103d05bf0bd1dddb2711ddb095c4a0efbcdb31e98d1d8092a86102ae10b53a7eecf090003063642 SHA512 49c2266103f6d0b47225f263c87c06a2ce817bed6e7c46c9c96a860d4afeb792f884c502bc799d5eee5e28867bbbd17829d6274b3526795a91cf068b1ec5fa0e
+EBUILD winbox-4.0_beta18.ebuild 967 BLAKE2B 52813eaf091676afc288c26999a8e36bf0e58cf36895245a5b6bcd2505d45247ef59a7d422c923998c8876df42fde42d490134b6c675de38bc9697c80048c8e9 SHA512 23c6ea46fce3589717d1a6e2d763e7791f6fd759fb362948f2169bed2471e506fca90d607ae71d00a73e99073fa259b0a82088aff15f4491c073bc3c3cffde1c
 MISC metadata.xml 397 BLAKE2B 74b4d1e3c50447f470c2004c6094ca281d3eb71ccfe0cb428321b7a132dfdc291b1d2e0b86d5582f9f5bf022b120427dad50fd797e1301fda8ef91a1c3b14b28 SHA512 f6680ee8e6bd0b29de66db0de8abdf11fa2187398954cbe2d6fe7b6ddf7d3af1ba89744cc340d6b54213812500c74cb6a7632d2dc74fd7c2223f0d9db1a74f1a
diff --git a/app-admin/winbox/winbox-4.0_beta17.ebuild b/app-admin/winbox/winbox-4.0_beta18.ebuild
index 84392ba5ea14..84392ba5ea14 100644
--- a/app-admin/winbox/winbox-4.0_beta17.ebuild
+++ b/app-admin/winbox/winbox-4.0_beta18.ebuild