gentoo auto-resync : 13:11:2024 - 03:02:42

6 files changed, 97 insertions, 76 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 68b3c2378d20..39904b00d41a 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 75ce3971d027..a0a7df65c099 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.35.15.gh.tar.gz 2810766 BLAKE2B 18a8464acede1801a533da89191c31309944123f092a08790d79f1a05d57be9540385e9acac75240c6595573685fbb3046ff3e85530881e25f54bc4213b944c6 SHA512 def601f10f9e4afe3b17b98bdeab58b3fe78b2171d5cc4bbe5892ae8fc348a1bb3467ef8051f6005091708df3c9e3bd85751cedf372f8730ee3197b6e833a652
 DIST aws-cli-1.35.20.gh.tar.gz 2817368 BLAKE2B 92c86af16eb29a22c437491c938c08d4a2745067ed923c52f271de3fd249b8fc35d4f7aa9a6e523279c463f619294096b5e88d9800a53fc9d3c3a9ddeae1e507 SHA512 d2a1aafd3aba9441b6560e1a197c1c65c3597883ac93cd8c29e1c88f03cd554039ffaacd8df10392189de5ed0b11169b2d32c8a5513ab70cc0a9f331eb87813a
 DIST aws-cli-1.35.23.gh.tar.gz 2819656 BLAKE2B 6e9d20410344f075ce12bfc8c0a49941a846f02304de9a30516376d0b6666b8c0a9affb36dd94a463f48f17f478f5d27e0f7375a48c63eca1b3a28927211e6aa SHA512 9075af833da9abc9494a2dd01a987b874e2b4444d7d5d1f4f974da1b56940b88603e8ec115662c85c2beb7cb70a65c3bcdbbd5510a1973433f8030efc6a1c69a
+DIST aws-cli-1.35.24.gh.tar.gz 2820137 BLAKE2B 04783d2232433070fdd468070e9a924a8737212cd5013f5c296d8cb2f287c3dd0dc9ecd5b73656b807c45db02bf28a10dd2049f2a06ed29f93e73de4413fbf7f SHA512 36d4f9f692c3bf199bbfb5464a089be9904e58a597fc352e40c5438c5b45c7e74e8123952fd502b7d9869c4629f95f46d5b1a59b0d436a22668182efd8eccd22
 EBUILD awscli-1.35.15.ebuild 3240 BLAKE2B 89fc679334ea535c78d19b48324652d5d867d9348e002ed52dc3a9e2da19aac3d97b4b1584ed43f0233ecdbd40f8d68def7b89fcd94e0c947cec1b4f47d68be3 SHA512 c9c9827b23178d1a976c1292704f5c28df75d7fddea370baa37c385b783299e4f4f72eea597a54e81656844ef41d8419cc21e49558806d512662eccf4da60ef1
 EBUILD awscli-1.35.20.ebuild 3247 BLAKE2B 563e1df537df7a081ac11e541ee21cea26a8799434021b9f814dc2e4a46704be1f2edf529ac225e8a9f6b3a4a81815b30d2d25f782f3b9e1dbcc098367ab769f SHA512 cb54a636f6b46f0956577c1141d9f1f7f2887c0bd53c1eca061f214dfe88591ca2ab9e7e96daa9f9c2b2b14b969c1effd8085928db3d5fcfd61463da871dbdb2
 EBUILD awscli-1.35.23.ebuild 3172 BLAKE2B 0db9ea2a5367a9a5091fa3c233651013f1dc9bf9e9b9d6b31163a0e6251662bebb04ada8f04e9a880dc9079c0302765ceb9f8f56b71de617d23a0d23617388c5 SHA512 e6c01254fdc3e702e008ad3a6e7aed38c4c7fcb9339ba23e665495dfd330cf597cc2f465806f39f8a35da8dfa91c22b5136c672a2c8c38a42f62342f16c97d82
+EBUILD awscli-1.35.24.ebuild 3172 BLAKE2B 0db9ea2a5367a9a5091fa3c233651013f1dc9bf9e9b9d6b31163a0e6251662bebb04ada8f04e9a880dc9079c0302765ceb9f8f56b71de617d23a0d23617388c5 SHA512 e6c01254fdc3e702e008ad3a6e7aed38c4c7fcb9339ba23e665495dfd330cf597cc2f465806f39f8a35da8dfa91c22b5136c672a2c8c38a42f62342f16c97d82
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.35.24.ebuild b/app-admin/awscli/awscli-1.35.24.ebuild
new file mode 100644
index 000000000000..23ee84e2ec41
--- /dev/null
+++ b/app-admin/awscli/awscli-1.35.24.ebuild
@@ -0,0 +1,95 @@
+# 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.(z+34)
+BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
+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/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index d02418aee5e7..d53a003e6e01 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,10 +1,5 @@
 DIST puppet-lint-4.2.1.gem 81920 BLAKE2B 5e291e4c1743092be9935231280f04ce3affdc1d530180f26a6ace0535a15e11bc9b33dd89d8eeafb44ebc7cae16f2656e293a6e8e8fbc4fd2cfde896996d59a SHA512 d39a287d3ae0ecbf27254c289e73918b62b50bbf8f44f51248e5e8042b194c32facd1215d7b24ab768714aeb9ae58647964bdc8b8b4650d1cebe6e2e749d782c
-DIST puppet-lint-4.2.2.gem 81920 BLAKE2B cad796866f323113a8c2aa5cf86b6187423f27186032ea76ebd1f158937c34f315d93de3d92b01acc0b160947b720bd987550c52aaa53a51f165396de776ec88 SHA512 e8a591e615db87dc2edc22fc4d53c03004e0227748896005d2252fab8b77193ecd30f9167702c6c4fd6551daaa0894789f3d9d50fb705eecaed4a22573a94afc
-DIST puppet-lint-4.2.3-pr181-fix-warnings.patch 5601 BLAKE2B a04fdf9d8627cc888924b4282a09e076d7e029eda008fc8da138a121a21e227cff45a54ddbe770a286a2a15e43d4402526a6201c805f6e574755a11a1d13d7d7 SHA512 15638f2d4a81c969aa77b51f2f147a1fba5544dd7e52f3127dc9949afaabbd161f815a22dc5091f19d3d16bc2be97bb50f455a3a67c503aff58e737288f80e49
-DIST puppet-lint-4.2.3.gem 81920 BLAKE2B ee98aaed336a4302c4d67d94c83f30f6fdfc111192b483f39a2c096f00daff2f7caf54bfa11c4b8217648a0ca68c6c8da5a4a6f2d0cab8efb6e2d7e814155780 SHA512 2f2192a48ed460371092ce99755b8cde55526ed96ee72d2a5b7989f7df7afb6abce5d3e8e7a0dca577b199bb380935e8734a92a53248697bb7195091da4cb9f6
 DIST puppet-lint-4.2.4.gem 82432 BLAKE2B 54bd65b917c184163adca920767b88d064cdd8c931d7911a64698d68a7b335055bd95bff91c462ecaf4111a231186ee5d2f2de42a04abffb519a67a4825bec59 SHA512 19b28de4e5d183dd46727cc4f7f7a6b81eb5ec7d0c7ca23514a015e43a7528bfc110853b82e65ac5da4d002abc3c21ce5d10abb6a97717b540d13570fd42eb6b
 EBUILD puppet-lint-4.2.1.ebuild 742 BLAKE2B 00873311aa0313507dafc33c0d26376cd93b696cace63bc16524dc77c67cfe3a8b6dc4cc236b47146357b47df2d1014f0e5a36b28a1ce761fedd5a08351820e6 SHA512 025c98112497b6febc347bb3e6e6d401c9d8811e266a21dbb0f97c4b32b0643143a2befce655ebe6c28466913c471952815f1ecd0b01fac5038a617e70e2ec6b
-EBUILD puppet-lint-4.2.2.ebuild 743 BLAKE2B 8e03d058dff3268f21aa61cabf05d3e243a87c4d76541798cda02a8cbd599ad3ecd7e25c189737ee04c564a8a0612fe86854bad299798a5311bd8a2bb49e490d SHA512 bfb13d8431ece4c9703329471f5ee243b3e2bcdf595840c21a48c9401958112ce01b3189c934005d4f4560e431738f746cbb800ab5bb891fd60c0e1a1f30ea95
-EBUILD puppet-lint-4.2.3.ebuild 929 BLAKE2B 684fc237878b14a531ee13adfad631b07eb7b467282c335cd554435d1aee4bf74702c7ce5db1209123ed70547888d04e33fec0e05aac5e240d7adf61f5aa9cbb SHA512 433e0dc365114f03771da92bc79cbe974a65f1e27339cd51d0d0bbc4bf5219f1c46d555c97bd28cf9d66d7a84c7e6042b1355331e7cd316c3596d64a60c804c7
 EBUILD puppet-lint-4.2.4.ebuild 932 BLAKE2B 1ed20ce1aa39ddfde960a7759c30b85d6664df73b0ee72796cc604bd7c7ce13cd04e346666d85eedb4dbe0e12a7a24ddc9e179b5e7256fcf91d923f1773f9286 SHA512 2f4a729a4896645d145e046afd0caf16b84cec9a5a88e7d3e6595bec81618ae6732cf221f59816564a36ef7a951e9ebe551f5c17d66e1a08cf17381960213429
 MISC metadata.xml 511 BLAKE2B 70060affd4524fb89e667e3a2d36e14bd885bd93f7bfb0c507f28f4838579aa589e7a8d9049774312473d080c21025de9c8cc4a48844dd76f3ddb26bf7265c19 SHA512 48414a8dc9cec6e577ffe653c23058a71a0263b6d4e25384d2f1cc3d5480dca6faf1e39750852040cddfb71b396327808cffb92534c603b82d54fbd9ef224917
diff --git a/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild
deleted file mode 100644
index 14e7e001cb52..000000000000
--- a/app-admin/puppet-lint/puppet-lint-4.2.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP="puppet-lint"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="https://github.com/puppetlabs/puppet-lint"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
-
-all_ruby_prepare() {
-	# Skip acceptance tests due to unpackages puppet_litmus which in turn
-	# has a number of unpackaged dependencies.
-	rm -rf spec/acceptance || die
-	rm -f spec/spec_helper_acceptance.rb || die
-}
diff --git a/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild b/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild
deleted file mode 100644
index a97d8ebb1616..000000000000
--- a/app-admin/puppet-lint/puppet-lint-4.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP="puppet-lint"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A linter for puppet DSL"
-HOMEPAGE="https://github.com/puppetlabs/puppet-lint"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCH_NAME="${PN}-4.2.3-pr181-fix-warnings.patch"
-SRC_URI+=" https://github.com/puppetlabs/puppet-lint/pull/181.patch -> ${PATCH_NAME} "
-
-PATCHES=(
-	"${DISTDIR}/${PATCH_NAME}"
-)
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec-its:1
-	dev-ruby/rspec-collection_matchers:1
-	dev-ruby/rspec-json_expectations )"
-
-all_ruby_prepare() {
-	# Skip acceptance tests due to unpackages puppet_litmus which in turn
-	# has a number of unpackaged dependencies.
-	rm -rf spec/acceptance || die
-	rm -f spec/spec_helper_acceptance.rb || die
-}