gentoo auto-resync : 05:01:2025 - 06:31:57edge

7 files changed, 5 insertions, 227 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f7a710e0a647..bde77fe6254d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index 0f620c05062f..8a076f9c82ee 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -1,4 +1,3 @@
-AUX resolvelib.patch 5731 BLAKE2B fdc0660ea786e02475e7e9735de6493cd6b96048c238ee050d1751a46cce12048112e495e1de48e1d1bb41d5d4415b16dfe294621bd0f6bbb0786c3df52dd35b SHA512 baf5f8c42c85628dffda987dc81b98f56f1a60857f4cc9e6f1b9938f4978d1ba4d84dc7904685dbe02e19a4b91a7a2f979772bbdd42268e6754bcd5208e40d37
 DIST ansible_core-2.16.6.tar.gz 3176041 BLAKE2B 37aa15e8d9165eb89db0704f7670f78f3e3a50915e17bb1d56689e65e6cfc0bb15b7e01768d25c5d2a9a00802411a6eefdb9ad70aa38877d7115bc40faafea59 SHA512 cd9cc8783e13b073cbfaef889e20c8a7dfb732c91de4bae2b496a64ef47b0325c637b4ab2eadbd0c56cb004e95f5294aa1e1548675a90f06193d62defd553409
 DIST ansible_core-2.17.2.tar.gz 3125313 BLAKE2B 383e3bba117831053c8147c9aca15ee6768506a90be29b784a7232061179b514aa1287a9131b6bc471167e4e5720d2f189fa5e23a3df13c634ba8b030a68e51f SHA512 34c0630798d2c4ae4e426a7feb29f7d88738fa89df2abd36b825cbf010709c5c3ba4feaa5590d2841535d2b367d04dce9a817e9076cec791c7e9fcb47853249f
 DIST ansible_core-2.18.0.tar.gz 3064903 BLAKE2B d3d9e6169aeb05685b8380072d36f6e161ad09fe46006ad3867bdaf91561a287156e88405da0707f53c000254dad91ce69e8a14ef6c0cc8bc384e7d61e1f4795 SHA512 49165e4a6a5bf16e1450ecda0387cb8a143981bf10215f45c1376a468de7efe5348f36d8e419e1d54d701b050daab71ed908a946df29a502d160a47139d8dffa
diff --git a/app-admin/ansible-core/files/resolvelib.patch b/app-admin/ansible-core/files/resolvelib.patch
deleted file mode 100644
index c38f10945d52..000000000000
--- a/app-admin/ansible-core/files/resolvelib.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From e30959723a9603ff94bc18ba58ee3adbf305a6b6 Mon Sep 17 00:00:00 2001
-From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
-Date: Sun, 12 Mar 2023 23:27:41 +0800
-Subject: [PATCH] ansible-galaxy - support `resolvelib >= 0.5.3, < 1.1.0`
-
-<https://pypi.org/project/resolvelib/1.0.1> released on 2023-03-09:
-
--   <https://github.com/sarugaku/resolvelib/blob/main/CHANGELOG.rst#101-2023-03-09>
--   <https://github.com/sarugaku/resolvelib/releases/tag/1.0.1>
-
-Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
----
- changelogs/fragments/80196-resolvelib_lt_1_1_0.yml    | 2 ++
- lib/ansible/galaxy/dependency_resolution/providers.py | 4 ++--
- requirements.txt                                      | 2 +-
- test/lib/ansible_test/_data/requirements/ansible.txt  | 2 +-
- test/sanity/code-smell/docs-build.requirements.in     | 2 +-
- test/sanity/code-smell/docs-build.requirements.txt    | 2 +-
- test/sanity/code-smell/package-data.requirements.in   | 2 +-
- test/sanity/code-smell/package-data.requirements.txt  | 2 +-
- 8 files changed, 10 insertions(+), 8 deletions(-)
- create mode 100644 changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
-
-diff --git a/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
-new file mode 100644
-index 00000000000000..6fd419f0d4f929
---- /dev/null
-+++ b/changelogs/fragments/80196-resolvelib_lt_1_1_0.yml
-@@ -0,0 +1,2 @@
-+minor_changes:
-+  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.1.0``.
-diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
-index d52006b24d7a77..1dcaf1c8d2cff1 100644
---- a/lib/ansible/galaxy/dependency_resolution/providers.py
-+++ b/lib/ansible/galaxy/dependency_resolution/providers.py
-@@ -42,7 +42,7 @@ class AbstractProvider:  # type: ignore[no-redef]
- 
- # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
- RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
--RESOLVELIB_UPPERBOUND = SemanticVersion("0.9.0")
-+RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0")
- RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
- 
- 
-@@ -220,7 +220,7 @@ def get_preference(self, *args, **kwargs):
-             Mapping of identifier, list of named tuple pairs.
-             The named tuples have the entries ``requirement`` and ``parent``.
- 
--        resolvelib >=0.8.0, <= 0.8.1
-+        resolvelib >=0.8.0, <= 1.0.1
- 
-         :param identifier: The value returned by ``identify()``.
- 
-diff --git a/requirements.txt b/requirements.txt
-index d096901ec2bcdb..a07aa985063b6a 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
- # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
- # NOTE: When updating the upper bound, also update the latest version used
- # NOTE: in the ansible-galaxy-collection test suite.
--resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
-+resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
-index d096901ec2bcdb..a07aa985063b6a 100644
---- a/test/lib/ansible_test/_data/requirements/ansible.txt
-+++ b/test/lib/ansible_test/_data/requirements/ansible.txt
-@@ -15,4 +15,4 @@ importlib_resources >= 5.0, < 5.1; python_version < '3.10'
- # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
- # NOTE: When updating the upper bound, also update the latest version used
- # NOTE: in the ansible-galaxy-collection test suite.
--resolvelib >= 0.5.3, < 0.9.0  # dependency resolver used by ansible-galaxy
-+resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
-diff --git a/test/sanity/code-smell/docs-build.requirements.in b/test/sanity/code-smell/docs-build.requirements.in
-index 80e8f66bc7f6fb..9209dd34ebecdf 100644
---- a/test/sanity/code-smell/docs-build.requirements.in
-+++ b/test/sanity/code-smell/docs-build.requirements.in
-@@ -1,6 +1,6 @@
- jinja2
- pyyaml
--resolvelib < 0.9.0
-+resolvelib < 1.1.0
- sphinx == 4.2.0
- sphinx-notfound-page
- sphinx-ansible-theme
-diff --git a/test/sanity/code-smell/docs-build.requirements.txt b/test/sanity/code-smell/docs-build.requirements.txt
-index 663e2c6c53d28a..7b4d563574c595 100644
---- a/test/sanity/code-smell/docs-build.requirements.txt
-+++ b/test/sanity/code-smell/docs-build.requirements.txt
-@@ -27,7 +27,7 @@ Pygments==2.14.0
- pytz==2022.2.1
- PyYAML==6.0
- requests==2.28.1
--resolvelib==0.8.1
-+resolvelib==1.0.1
- rstcheck==3.5.0
- semantic-version==2.10.0
- sh==1.14.3
-diff --git a/test/sanity/code-smell/package-data.requirements.in b/test/sanity/code-smell/package-data.requirements.in
-index acec62eff91ff8..50e8568c5cf8bc 100644
---- a/test/sanity/code-smell/package-data.requirements.in
-+++ b/test/sanity/code-smell/package-data.requirements.in
-@@ -1,6 +1,6 @@
- docutils < 0.18  # match version required by sphinx in the docs-build sanity test
- jinja2
- pyyaml  # ansible-core requirement
--resolvelib < 0.9.0
-+resolvelib < 1.1.0
- rstcheck < 4  # match version used in other sanity tests
- antsibull-changelog
-diff --git a/test/sanity/code-smell/package-data.requirements.txt b/test/sanity/code-smell/package-data.requirements.txt
-index 6411020e47c67b..afc3cd6418e84d 100644
---- a/test/sanity/code-smell/package-data.requirements.txt
-+++ b/test/sanity/code-smell/package-data.requirements.txt
-@@ -5,7 +5,7 @@ Jinja2==3.1.2
- MarkupSafe==2.1.1
- packaging==21.3
- pyparsing==3.0.9
- PyYAML==6.0
--resolvelib==0.8.1
-+resolvelib==1.0.1
- rstcheck==3.5.0
- semantic-version==2.10.0
- types-docutils==1.5.0
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 7ceeeaa49950..563a80dc7ad5 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,9 +1,7 @@
-DIST aws-cli-1.36.22.gh.tar.gz 2853997 BLAKE2B a9f309c157595edd37e87834e7b67c16c04edb8f9f2381e8dd2335cc932b2071f7cfd24ca4abd16100ef1de21adb7f502af911d71c20459e0321a9375a49ec0e SHA512 05ee5d22f5f552ba0e7eaf4a1a88bcb3a2cb8db30315fdbf04d9c9c1c69b07ae3a8727e1dca1b154d9dad4bf89aa5950c0f369a965f92ec99f7e0251665f13eb
 DIST aws-cli-1.36.27.gh.tar.gz 2874317 BLAKE2B 5f696b14ba47e6b9b0150e600d7f3241d5bebc1c66e848239221db74dada3c358c5eae795e9d3988383ac431f449729c4226e17724d54d5a6b9531e046c15810 SHA512 0e8dd2bb6dc086f3ff29931c1f41778f6c25e3a173def142f12b6e57fac6edd0df0cd588bc522045561afc44827b8fd2a0bcd582bb72ee01727d22bd0b34a3cc
 DIST aws-cli-1.36.31.gh.tar.gz 2876521 BLAKE2B 6ba90d3852b25608bb908b3853bff3de7c0fb94ee6177177abefab16993e7cbd85dec62db8e453c4de2e846bda7ab46efb8e71f6bbb28a458e5bf7cbd53cdc7f SHA512 a0b7de55c3bd518f61d112fa9bd710636ba0118322ceedb959cd2f814fb6dd983516717a3a0c6b3af3a507365da2b73553ede4e0e6dd691601fdbe8e90c0fa68
-DIST aws-cli-1.36.32.gh.tar.gz 2877216 BLAKE2B 41e5033374cb39d3ee1cb871d3b01a67944dc397ea21e7069acd7b8059c8a1aa04698d78c0090a75bf00b8c4e55d961e34b47f896d7e678d6bfac9d417154826 SHA512 b02b9ae9e92c7fc2d3e46e7d1aea83ce23ab3e40d8f908e68e4e6afd4b58e8222caeea34a48ce934d8494290e1e0279dd4b49305c6d4dc73216944d0dec264db
-EBUILD awscli-1.36.22.ebuild 3179 BLAKE2B b08625a4293f13915f076119919380f482a550799f0b4a8ba37f413fb23314bd5f8ee153658520d17560e91fc464ffdb0bc61f444dda692627baa6ddc80fd97b SHA512 2acdae36bf23c5c4c4bf23ca22ef04df62e76f08fc3ecc9acf6ba28bd4c6b9bd325f301123c9cb5694b62991cf41bfcff797ce4c72ae07e0d7c490df02adae4c
-EBUILD awscli-1.36.27.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
+DIST aws-cli-1.36.33.gh.tar.gz 2877337 BLAKE2B 0e3cdbac864370c0ef785191fc692e1a28c81467fac6e8bc5840b6fa79ef6b09583ce70f85b2220538c587ddf4c320aef9ba2cb9bfaaa30c68f0498556b256f0 SHA512 78a106f0fd30eef9f6e0d48800fd7f2144ffd7a01adf669d6d84ab5f064045a6c163bbd042a788c3d51a70060165f0d29a603734ac43680afcb4711dc8e31b53
+EBUILD awscli-1.36.27.ebuild 3179 BLAKE2B 166dab27a2c434c083129b7cfd4dd2af3a1b7d60e98bca4c664a9540b62421228aaab77a2a654799c79b0003d81bab00c78e12bda5a931bcea30afff0ecc8c32 SHA512 10bead82e87c3c857b4fa2c4168629b4113d49b481374b95ad5813cd440d9f5d36d3e0413c28038176f31d11a873d41638e31329ef1360e5755b95a90f6e441b
 EBUILD awscli-1.36.31.ebuild 3186 BLAKE2B 63a0fb498273465997fdf8010dcec351d473545febb8aaf2c222c3176a00f0cce5edadbfbc778689949142466c05e371a017c07a54ce30deb7bd7ca86cdb1e82 SHA512 2db712c340a0d13e4f89a8ca4599cb89f83d11d519b2f90f1dcf72e903830d70ae31efbed50a958b98655e24327cc027c0c945bc061f9de7c8fbf4d45f2fa625
-EBUILD awscli-1.36.32.ebuild 3186 BLAKE2B 65b27edf9a080dad4a72a8fb6426840ffb39c57c020d93482c79003438b4b3523e24526c27bc4a186630245535f796454c03f299604eb03707d777cd4bd77099 SHA512 5fac354f14a164645961d81b8731b1a03cde670d69c600cae21b89245564d6f566652fcb5d7b5eab3012de676a8e7da85c424bb823a53a570f988b5b4b9b3e70
+EBUILD awscli-1.36.33.ebuild 3186 BLAKE2B 65b27edf9a080dad4a72a8fb6426840ffb39c57c020d93482c79003438b4b3523e24526c27bc4a186630245535f796454c03f299604eb03707d777cd4bd77099 SHA512 5fac354f14a164645961d81b8731b1a03cde670d69c600cae21b89245564d6f566652fcb5d7b5eab3012de676a8e7da85c424bb823a53a570f988b5b4b9b3e70
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.36.22.ebuild b/app-admin/awscli/awscli-1.36.22.ebuild
deleted file mode 100644
index df478e59dd61..000000000000
--- a/app-admin/awscli/awscli-1.36.22.ebuild
+++ /dev/null
@@ -1,95 +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..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+59)
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=(
-		"${serial_tests[@]}"
-
-		# 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.36.27.ebuild b/app-admin/awscli/awscli-1.36.27.ebuild
index 2960403cf7e0..33a278734de6 100644
--- a/app-admin/awscli/awscli-1.36.27.ebuild
+++ b/app-admin/awscli/awscli-1.36.27.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
@@ -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+59)
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) - 1)).$(( $(ver_cut 3-) + 59 ))"
diff --git a/app-admin/awscli/awscli-1.36.32.ebuild b/app-admin/awscli/awscli-1.36.33.ebuild
index cffe1be806db..cffe1be806db 100644
--- a/app-admin/awscli/awscli-1.36.32.ebuild
+++ b/app-admin/awscli/awscli-1.36.33.ebuild