gentoo auto-resync : 06:09:2023 - 22:26:53

4 files changed, 78 insertions, 10 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 3d57c5763e82..bae9911e90a0 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 28c267475a52..2d55897b8368 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.29.35.gh.tar.gz 2513024 BLAKE2B 7802c0eda498235938c5f409076b7706f
 DIST aws-cli-1.29.38.gh.tar.gz 2514130 BLAKE2B 520d86ecc116ac106b480eea03e71ac89a236f4ddacd04a0cc6ad053d5b893df27cd7a9ab11a9902cdabeaf344ccf452c5d87bfe91694e756851a0af77ec25d5 SHA512 3dba9699066fe1d886801f0d68ea426f76904dd6a147c1e23f816dd06c677ba2675881fb677b71426833f0f0c364ae003e19dcab1490ceabb9a593bd153897e3
 DIST aws-cli-1.29.39.gh.tar.gz 2515251 BLAKE2B 64324482a795d1d537953da21717faf952cd59b1473186cead596577f7089efb77a5803e5c57183ea5223ab10bc77910d0a13b6e94597e389ff09088e4df72b6 SHA512 aa1092cd35e4cb71cc7568bdde1bc3dbae5999b07f977bda0ade6fab00f87d825f8fe8165e241b3185d149d652684c725c1ad43260bf848d94cb61e8a46d16bd
 DIST aws-cli-1.29.40.gh.tar.gz 2515692 BLAKE2B 1d7b93da39719ddd4813973f9b06f9f979ee043d81135585da627d2894254d8f200b9da9d29754a9270fecf948c47c97f3209ea47d5365a6af5d2a78526f6a07 SHA512 f0c55077f2e7f87990b0304269fe93835574701eb533569f773be407e9b3d0cca671b699911d9e2c728bd9c2181c298a92eb4f4a791d940964e52e66fa493863
+DIST aws-cli-1.29.41.gh.tar.gz 2516949 BLAKE2B ae8b2c2c47b72832a038e883fdc6e15d2b59ac520203a21a1093f29d84131d054457700e59d3184768d1040f84708a73c4dac85fe2b1e99e121924c03f9b1ded SHA512 c48d16c577d4d3ac1038f33c716db6b9a61241a595b37105cde0841c84a3157f3004aaf8fd1ff95ef9b64837f8ab4c50cd875cd36154b4285bf01315b817b283
 EBUILD awscli-1.29.30.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.29.35.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.38.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.39.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.40.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.29.40.ebuild 1911 BLAKE2B 01f63751aa4df11832a25c3ce256de60b80d4842d06670f346a921a6ba520686a4fa00a090aa5c6f8514e78e47512a1f2cb6f1acc5ff738b7803158710b0b28f SHA512 0e3920cfd0d9be1aba24eb714837d558016ccc7cff2f58e7b9a772ecd318d56880ac9b04a8647d2ee83de8437781418f8e63a1f5e913718a64ddb0a860e57cc7
+EBUILD awscli-1.29.41.ebuild 1911 BLAKE2B 01f63751aa4df11832a25c3ce256de60b80d4842d06670f346a921a6ba520686a4fa00a090aa5c6f8514e78e47512a1f2cb6f1acc5ff738b7803158710b0b28f SHA512 0e3920cfd0d9be1aba24eb714837d558016ccc7cff2f58e7b9a772ecd318d56880ac9b04a8647d2ee83de8437781418f8e63a1f5e913718a64ddb0a860e57cc7
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.40.ebuild b/app-admin/awscli/awscli-1.29.40.ebuild
index 62c19f3a63fb..b11b8e9f8900 100644
--- a/app-admin/awscli/awscli-1.29.40.ebuild
+++ b/app-admin/awscli/awscli-1.29.40.ebuild
@@ -56,16 +56,9 @@ src_prepare() {
 }
 
 python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
 	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
 }
 
 python_install_all() {
diff --git a/app-admin/awscli/awscli-1.29.41.ebuild b/app-admin/awscli/awscli-1.29.41.ebuild
new file mode 100644
index 000000000000..b11b8e9f8900
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.41.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+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+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+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 -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
+}
+
+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
+}