gentoo auto-resync : 01:03:2025 - 19:28:40

12 files changed, 85 insertions, 395 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 4a5b6d837083..e9dc97d5430d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-molecule/Manifest b/app-admin/ansible-molecule/Manifest
index 19cad33638cd..d2250664e9e8 100644
--- a/app-admin/ansible-molecule/Manifest
+++ b/app-admin/ansible-molecule/Manifest
@@ -1,6 +1,8 @@
 AUX ansible-molecule-24.2.1-mkdocs_google_fonts.patch 156 BLAKE2B e311c1a4c1d3cc9a087611a70dfa6a5634d0842afdd426a708a390b7391507e330d2d9680a5b5a85949d9985beafb80fb146a53742d645d1b8ccb78f5f7a4f64 SHA512 66113e61b0f97243e15afc7b7fea8657cee0cabfa450a2bbe6a1b751cdd9cd82be6bfad6b36802377fd3261e9e55d3d0e37eb44e9c26838110495cd43773cc9f
 DIST molecule-24.12.0.tar.gz 4412418 BLAKE2B 0dba13534a7d4d9b1095c38e9694cd51b3e750cb9ab611b3078972182d09319a7b858e3dba018c370a9b7c6a8065036f60d8cab58da1e7ee9660be746b9bdf34 SHA512 6d709832091514b55f697ed70d7c7ae4695537a868ed3e8a0b0cb1c868ce5b161baf849412f94fbe723fae491a4ca4e510179ba69c40a3b48711aef36cedc2ba
 DIST molecule-24.2.1.tar.gz 343228 BLAKE2B 9605b5a8e21d37597cbf35f0f6f811471909dde5496541b1d7cd130eb2b970125fdc291df6493f8716f38514df17d957094604ae49e64d16f2207a0d3682bd38 SHA512 3813163d72cee51987d340c8a1ed0e03d8abe509a601e94c3e32bf673a56edd83d0c2bde1347057fe8a4c2b37e11a068ef689dd669d4395da64bec3921f1403d
+DIST molecule-25.1.0.tar.gz 4416129 BLAKE2B 429bf0a315cd82b9e4e877f05e62c07e48fb639bbb5f74ce457e49402343858569a19ab1375fc9fe1f2127c60c9002a256dfefde3eac8b4923d290cfd32c2ad6 SHA512 b998a2d04c5a9aa4666120494a41cf8298757228e69070ab08b0c9862f0b1ecfd68803277d53911c18d67d6a1faca2e717366c3fce35d4059b55127e387a0e4f
 EBUILD ansible-molecule-24.12.0.ebuild 2769 BLAKE2B 0e75828171dc2822f975fffd3d7fefff0e50ba757b051e4d2e580fe33524553493b3cead82bd3bc955cbd5b775c5a5c251c17489b405eea4b9f00cd12c63d5d1 SHA512 4b1ae75150f56f422d97d8ad240dae0f19a37bef617eba9b7c01807d580d06b0b13938f3e09f3c606b8b2a964087f71478bf074cdd96fa3a9291ef7d46299f47
 EBUILD ansible-molecule-24.2.1.ebuild 3013 BLAKE2B 09a564d6bfbdb24f4b21a85fdb7fb0d2628d0eca850d1fc432e02fbbbb8fad54e9fd18e4dad62cffddb0b892cc75a134bce7e038661a602946a964e1f609ecb3 SHA512 522f75b7c647be53e1f29aec012b680b4faaf8d3952e4f81e29e1fd5acb80ff33641d2511504cc1d0c772c8c2b85a46feb3818124f685f2b0520b964cb272096
+EBUILD ansible-molecule-25.1.0.ebuild 2769 BLAKE2B 0e75828171dc2822f975fffd3d7fefff0e50ba757b051e4d2e580fe33524553493b3cead82bd3bc955cbd5b775c5a5c251c17489b405eea4b9f00cd12c63d5d1 SHA512 4b1ae75150f56f422d97d8ad240dae0f19a37bef617eba9b7c01807d580d06b0b13938f3e09f3c606b8b2a964087f71478bf074cdd96fa3a9291ef7d46299f47
 MISC metadata.xml 319 BLAKE2B e21046964335743f016597d0b19ef5edba9452c5cadeaf9db45a3443cdf3320b8c766a8e2302cecc203aa333cbd9c988ffe0330a7e07a083c3d157ae4b8e91c1 SHA512 b082b103d0c47df58411d7ad1e67cf274d287f8398d4235fe83d2a6f7e722d72e9441ec919510f98965b2d01ebe1d9fd25fe987a358786d2cc55ea375c7fed3d
diff --git a/app-admin/ansible-molecule/ansible-molecule-25.1.0.ebuild b/app-admin/ansible-molecule/ansible-molecule-25.1.0.ebuild
new file mode 100644
index 000000000000..bb26dfb43631
--- /dev/null
+++ b/app-admin/ansible-molecule/ansible-molecule-25.1.0.ebuild
@@ -0,0 +1,76 @@
+# 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_{11..13} )
+PYPI_PN="molecule"
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="A toolkit designed to aid in the development and testing of Ansible roles"
+HOMEPAGE="https://pypi.org/project/molecule/ https://github.com/ansible/molecule/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+IUSE="selinux"
+
+# Since around the time of the switch to the yy.m.patchlevel versioning scheme
+# the test suite has been completely incompatible with Portage, with several
+# tests which do pass under Tox failing even with disabled sandboxing.
+# Nb. As of 24.2.1 two tests fail even under Tox, for both PyPI and GitHub
+# tarballs.
+RESTRICT="test"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.18.1[${PYTHON_USEDEP}]
+	>=dev-python/ansible-compat-24.10.0[${PYTHON_USEDEP}]
+	>=dev-python/click-8.0[${PYTHON_USEDEP}]
+	<dev-python/click-9[${PYTHON_USEDEP}]
+	>=dev-python/click-help-colors-0.9[${PYTHON_USEDEP}]
+	>=dev-python/enrich-1.2.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-2.11.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.9.1[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-6.0.1-r1[${PYTHON_USEDEP}]
+	>=dev-python/rich-13.7.1[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-8.2.5[${PYTHON_USEDEP}]
+	selinux? ( sys-libs/libselinux[python,${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		>=app-admin/ansible-lint-6.12.1[${PYTHON_USEDEP}]
+		>=app-misc/check-jsonschema-0.28.4-r1[${PYTHON_USEDEP}]
+		>=dev-python/ansi2html-1.8.0[${PYTHON_USEDEP}]
+		>=dev-python/filelock-3.9.0[${PYTHON_USEDEP}]
+		<dev-python/pexpect-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.10.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-plus-0.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-3.1.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-24.2.1-mkdocs_google_fonts.patch
+)
+
+# test_role.py doesn't play nicely with FEATURES=usersandbox. As for test_command.py:
+#  - quite a few of these tests use the network;
+#  - test_command_dependency[shell] only works if Molecule has previously been installed;
+#  - tests involving creation of a new scenario fail on ansible-lint errors, even though
+#    a config file is deployed which should skip expected issues.
+EPYTEST_DESELECT=(
+	src/molecule/test/functional/test_command.py
+	src/molecule/test/unit/command/init/test_role.py
+)
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature_header "Some optional packages commonly used in Molecule scenarios:"
+	optfeature "checking playbooks for practices and behaviour that can be improved" app-admin/ansible-lint
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index d655855779fe..ca2977ed878c 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,15 +1,7 @@
-DIST aws-cli-1.37.16.gh.tar.gz 2903703 BLAKE2B 0d3333bef89222e9e84de2c469a98c6fd19177ba6c7e69278e43f459f1909d67e07cdc4150189dd3fd2ce1573ae43a22c944d172738de6102ecf7c7ea00404cf SHA512 d9916ecfedd8bd9086608b6350f95374efad96f3af6adc8b372a254021e4b9f00c43a7c5759cd74f20082f60806fc6eb13d8daf7569fad303995f6d180958cb9
 DIST aws-cli-1.37.21.gh.tar.gz 2907762 BLAKE2B e42e9aed28ef3cee1b83f2e57f90ce81a9894bc23a960fef487096ce8b8bab16d23121658aed0547070919ae78a0476176f9517d583a84be90bb016c7cdd9bf7 SHA512 3c7b347627b799d7a3edc7a8cae3d6110ec3cc5bfcdecc247876135faebc2235546a514afbdaf95fec50cfe787ca30b125cae7a8e7be84134d83493a0f869b1a
 DIST aws-cli-1.37.26.gh.tar.gz 2909650 BLAKE2B 77843b52fa77410c9568dcc402774352b839591264f16ce4b27c58f5b52fe159afe029756b702132c1b6e611f2e40d5a27f26d830928c2716ec285e58201ac16 SHA512 0396541bead54c81c9c9219403aa1d7dcf8f0a60b58d8ef33ff1900ae3d44cd362b4d0f2fdd93fee89a068bba1b5afefac44bcd8f5624368b2a02044acd070d9
-DIST aws-cli-1.38.0.gh.tar.gz 2909973 BLAKE2B fab770764dad523c31752f6dd79093b528d3ebf36c8e2e5df140172d14069192747ffdfe8323e7f68de81ba49498febed302f0f7ae73381ed6b5fbd181fdb8f3 SHA512 06f10c3b0adddebe492c7219aa44f143fc91667989b76bcb2ce75d27a3eeaacb64a5e633ab84b56f6c3cf45877c96c4c98c8e23198eabef994e4b77f9a620cc5
-DIST aws-cli-1.38.1.gh.tar.gz 2910408 BLAKE2B a2c8085b633fec9925145511a0b66142628effe04f08142ed91e9507ecffd97f3a3eb9a0b92a385fd7ef2f1fd8eeeced05502e3536e06b56e57aa86091867d38 SHA512 6783d26fa11d5302d04e678e80b64c15aceaf2b4029dcc687b2444c9ce697850c4eea10e9a20bda5db140c26102ae05b664ff94cbbecb7e3699aa8eb00d3040e
-DIST aws-cli-1.38.2.gh.tar.gz 2905602 BLAKE2B 6605fc4cee053096a23b7ab29e0aae2cf45bb4069d477488b7600fbdce0801efe1910b883f9fdbfc0e1d515590662e4f877847438577239fd66e2999a23c9c49 SHA512 24adc8df456e95bf87e48c6b5b174f7057ecc57035be1177122f3570936211ea75a783174c2a38b1dea3753991ad48fe0f8989bfb30ab3045d68106239f37886
-DIST aws-cli-1.38.3.gh.tar.gz 2906039 BLAKE2B b720f9e44a01dc880216f54f14cfc4f9632f4ba9ba9b24f3877add8a0632199e9f8baeb4f4b0fcb26ba399c7ec11622528f82d2b2cf4bc2ef5b774effc9441f8 SHA512 2e66d834c1bd15469c88dc5a09a55a9e5021f3e074a2e1343a034ae964bb232d2e9eb5ddbf7decb0b87df38123d62bfd7ef09de65fb5cc0f7c6d3636a20524bc
-EBUILD awscli-1.37.16.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f
-EBUILD awscli-1.37.21.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
+DIST aws-cli-1.38.4.gh.tar.gz 2908307 BLAKE2B 1dbae7f032e920b950cedaa5223692c88262b32af1fbd7cd5459110e6d987182bb321a2e689d2ba0b74757faa3d5dc8602480fd735ac227de1cf1975414019a8 SHA512 5c255d7b9cd63c49255b53e66f0800d1c7e03a68c18dd11f23f13d3a60dc06ac868f334cf3b1b29ece0cf0f458862a568283729f320bd0095211fc9fac0e7024
+EBUILD awscli-1.37.21.ebuild 3162 BLAKE2B 099b63681a7300c07c777d38f73edb68bb3d6421c65bf17e778a168441dcdd363e259fc399f7a83598e536bf27f534ccfdf960d1b356f180771b4774962df246 SHA512 662f08a57b1fe95a8fed4bd9c477b865526debd60be4d8164ef0a8fdeb7c4ef0cd71aef17b16717fbf189db283c13ddc13a3ee0c25f0541888f829b0449b134f
 EBUILD awscli-1.37.26.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
-EBUILD awscli-1.38.0.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
-EBUILD awscli-1.38.1.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
-EBUILD awscli-1.38.2.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
-EBUILD awscli-1.38.3.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
+EBUILD awscli-1.38.4.ebuild 3169 BLAKE2B 5e19b6d6b837a3f62a7f54c25b76d2dcebbd709ada36d473cee53d0cfc2aa7b3de92cb12db09be4fafbd0b5c303761436b25bf3b4afe16cf0119481959e2b9c2 SHA512 0d30f1cd05a160c7d70f85cc5887d9333b9512421c74d394cae05799229c74c2edb307434f90b64353cd8963b85889546df20e3bf5e7a3fa8953ae2b4a6cecdb
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.37.16.ebuild b/app-admin/awscli/awscli-1.37.16.ebuild
deleted file mode 100644
index 2bb0ee1db5bd..000000000000
--- a/app-admin/awscli/awscli-1.37.16.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.37.21.ebuild b/app-admin/awscli/awscli-1.37.21.ebuild
index 4a8e0ae852e0..2bb0ee1db5bd 100644
--- a/app-admin/awscli/awscli-1.37.21.ebuild
+++ b/app-admin/awscli/awscli-1.37.21.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/awscli/awscli-1.38.1.ebuild b/app-admin/awscli/awscli-1.38.1.ebuild
deleted file mode 100644
index 4a8e0ae852e0..000000000000
--- a/app-admin/awscli/awscli-1.38.1.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.2.ebuild b/app-admin/awscli/awscli-1.38.2.ebuild
deleted file mode 100644
index 4a8e0ae852e0..000000000000
--- a/app-admin/awscli/awscli-1.38.2.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.3.ebuild b/app-admin/awscli/awscli-1.38.3.ebuild
deleted file mode 100644
index 4a8e0ae852e0..000000000000
--- a/app-admin/awscli/awscli-1.38.3.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.0.ebuild b/app-admin/awscli/awscli-1.38.4.ebuild
index 4a8e0ae852e0..4a8e0ae852e0 100644
--- a/app-admin/awscli/awscli-1.38.0.ebuild
+++ b/app-admin/awscli/awscli-1.38.4.ebuild
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 5533fee80cd8..a746695b0615 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -5,5 +5,5 @@ DIST filebeat-7.17.16.tar.gz 101629004 BLAKE2B c67eed28574948022673737dba4d39409
 DIST filebeat-7.17.25-deps.tar.xz 696720440 BLAKE2B 795bf60e9bf55b5bf32587a23aedfdfa5bc0e891ff976fc8be5000a12a6053bd75149b927f7c29c012346eb92446b0bd89e6fbf8b42f60c3979f928becc7f65a SHA512 aae8f2f8288819c1104ca74faa81b78534c1bc2a7ee884f8eb2d4e2e0d47083ad1c3fe4eca9ccd16e50c2838319082ae14ec484ddda7073b40e0b0e523ba240a
 DIST filebeat-7.17.25.tar.gz 101680280 BLAKE2B bec6a6f87d67c44cb050c29c39dcf78dd90a48945669de291c3ba2a1bea07759e596294482c7841df535f97ff7ae9ff4690a70196b4776e0bf9b7657568d6800 SHA512 893fcaa18c72f0d6d6d3ae7c2c65d57242b2ce8284118acd15a2a18f0818fcdb9870dccdc7dd69ba5ec3fa0648471497711fd1ed13f978a84841805a67627e09
 EBUILD filebeat-7.17.16.ebuild 1340 BLAKE2B 46e8c6e3088ac4fb9a70e509c171c5fef1f36d0db6145b398ab1bdad1e9ffe4f6ca4ea3dbf10ea02a6ffb335e20e84f18e8fcf9e7e7d707df72bd135cf30741b SHA512 9eb4a95ee44a5ff31f1e7114b4d2f87f919786f2fb8402977cdbd09d30101aca89f00717fc847ba5eab7a39351a882d93173d9673dfb87b32271c2eb54cf7e03
-EBUILD filebeat-7.17.25.ebuild 1331 BLAKE2B 905d9b7751114307fcc95f2853c41d506a968cea73524a638e239c766b89335803f45502d9cb7b8237e5a372a7d0ab2502cbcd4d43104dafe1b11c2c65743eba SHA512 52a6ed19b426ec9fd22dabcf804dff623e639b8f0c7f1377abd9137413402e5316410bb29c24f8c573ec508819cbc98d224e9d975b1b9aedf79d15519b5521d0
+EBUILD filebeat-7.17.25.ebuild 1330 BLAKE2B 5f09bf962040e58d9cecfb16a922721ce00c3e613da60690686243d88cbff785cb43dbe9a06220cc3a32355289a1e1fc801306ee8dc68ebf49266e432c13c59f SHA512 c73e3fd879dc5c97d493742137f0efe7c7ad4dc1a9097a57e2455546c05ad46f7a582152cfd551ca62fc34167bf29ec40b51266425247d866339f6d24d52e89b
 MISC metadata.xml 492 BLAKE2B 6b16876306316f37d59bf32aac33a2ff918c63dbf2ca0f71448249b20e99e5576f20dbad997a227730cb836c7f244ea8301dae62603e1961127bd755ab87f5b0 SHA512 c42a8bc75fd53383ea094d5049ba5f294cb8a2f0b0fe435eb74427bc82751bfbe4e4bfe076abbd052946ae6b0cf2f7129040a47b439a704629c6846ce6b7fdec
diff --git a/app-admin/filebeat/filebeat-7.17.25.ebuild b/app-admin/filebeat/filebeat-7.17.25.ebuild
index 6f4efaa268bf..548f8d3ed9f4 100644
--- a/app-admin/filebeat/filebeat-7.17.25.ebuild
+++ b/app-admin/filebeat/filebeat-7.17.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 S="${WORKDIR}/beats-${PV}"