gentoo auto-resync : 19:08:2022 - 20:37:18

5 files changed, 167 insertions, 0 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a4ad75c73c29..fe9894d1764e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
index f4b72336a59c..0b2fadc89393 100644
--- a/app-admin/awscli-bin/Manifest
+++ b/app-admin/awscli-bin/Manifest
@@ -1,10 +1,13 @@
 DIST awscli-exe-linux-aarch64-2.7.11.zip 46384612 BLAKE2B 1728dac769441954b86f1436708c7b84aa4d1f7affc634de9e6a7bea66a10e5143a6d1da3fd24e8e721cdaabff0bb4b363bef78e29aecc976e9cd5b961284a2b SHA512 3f3e2670614bdcf6751d556a8a150d573712b036ad904a7cbfbb85600241d04f7f257df2d1159e2fb6f5b0d02b7f65df1bfb00764218ef60782a04a7fdebdc2a
 DIST awscli-exe-linux-aarch64-2.7.16.zip 46227549 BLAKE2B 28c72891454779337e7da8cb554310d54af0d3e3aab45a9aea76350eb0db5cba592c67f55f8feb0b4f57044a7b2292d6ac79809ceafd1a8d62639c67f6018e7c SHA512 e577e3507310dc48d323635592df5c7c12ac5ba90578d5e9e0a74264007b3c4bcaa0bf43d95f37d4974e7a83e57fdd3ec3a36e43ccd8ad359d5a56b7cda7402c
 DIST awscli-exe-linux-aarch64-2.7.20.zip 46289081 BLAKE2B 1750e609bef53775e4bf66f1be78e2b05f763bde7677be99867ae89e252f1deb81dddf6011718ceafe1f97b53ac4871657f2644c478887eb4d021e14be400121 SHA512 f519aaaf2ebc3e163ae55abdb85b08dd49e148f902a06e671f582879790bdfa07e32f8d8e773ddeb95494aee3a38dc3fbdf91a93b14215f63e13ae87cdf3de4a
+DIST awscli-exe-linux-aarch64-2.7.24.zip 46460084 BLAKE2B c24cf41c888b1469a793354c9a97cec4273f6a762ec74b4079ab8626d0eddeb95dec5ef66270764a1c8d3b1525a5460e63009441ac83ef966b43f68efe41b00a SHA512 ee4201a193e393cf7fd1e9c473eaf41a1d7934e342035b931c3d69e985bc9e74434d31d0b46bf176c27c41d1b1000bbd487a514d62c8ccdf8d7c7e82c621d1f4
 DIST awscli-exe-linux-x86_64-2.7.11.zip 47188206 BLAKE2B 9530ad2cf832dab1d5fb38a4942d338629c24bdadebe6abd0ba3a1759688e2ea9666cd97d8643d6ba7469bc446f09bd4c63a43f36deba1afb133ef00da49ce6d SHA512 6a15745502e273ddfad1d9ac118aea1684cf62f533a0fa3ac7661c31e49984ce1d0b608c61f5ed182692686ab7fd992f9a8da6a066bc4da6fe5e3d386548ab8f
 DIST awscli-exe-linux-x86_64-2.7.16.zip 47030919 BLAKE2B 1ac5789003753b015278eda42109c9ca5ee4710d32b07940c3abac0100844065fa6bffdc854446a7b4493727d3648f0514fe10e09b50c77d79f42139e2c64fcc SHA512 ae76d7425974154f481546b804cc6f359702f9357e670dfaaa7f943aa2ca27124c66388032ad9b4fbd05d82f73b7401fa7d07d7d4742c8f37c49eca17e6e6564
 DIST awscli-exe-linux-x86_64-2.7.20.zip 47092365 BLAKE2B 26320deb54f66043693aa40cd2fee2e110f2dbf1710278ce431781d49096860dacd906bd91a01160c69c484020cc1ca497954283213e85d42206ab2dba3f1c92 SHA512 6f5ab60fe3b59a7c8ad73e81b3d3003660736fe9da35e5e44b8d222a94cf195676a4802e8ea391bbefb9cbece77860148be1f616f32281d18726af126c7daa4b
+DIST awscli-exe-linux-x86_64-2.7.24.zip 47216162 BLAKE2B f99393a089bc495fc82d4f208f555bce144adf817b15c2995ad97493c16e18e38ee6cb77fb29c9225ff144193f878a7334ef90c318a5770d5c58b1f7e2209632 SHA512 2c25637fa421117aa3629ddfe8f9ead7ad3d7f04ead819b958e2b274621c858ea9e1ba2d9c111e63511ab75a1a7f0db275f653da2fef58dd5ee03274b1e7e8b7
 EBUILD awscli-bin-2.7.11-r1.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
 EBUILD awscli-bin-2.7.16.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
 EBUILD awscli-bin-2.7.20.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
+EBUILD awscli-bin-2.7.24.ebuild 2305 BLAKE2B 49bd417c8c54ac715176c3043dff2c99ff48f2eb62c80e26f4464c9b9bba989de0eed39f7e12a435098a02b50790cf0b6c3f2ea073f4af3669981728d3124cd8 SHA512 2977797f3c8e9a1a16e5cbad3de6c765234d2d093cca1f166929465f75d116e92fc7be4bc6f1bafe63f1a82d303bbc9cf10b3cff88fb89f79aca5df7c10a88e3
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild b/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
new file mode 100644
index 000000000000..84c6be57c790
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.7.24.ebuild
@@ -0,0 +1,90 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+	https://aws.amazon.com/cli/
+	https://github.com/aws/aws-cli/
+	"
+SRC_URI="
+	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+	"
+
+LICENSE="
+	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+	openssl PSF-2 BSD-2 GPL-3+ public-domain
+	"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli
+	sys-libs/glibc"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+	ROOT_INSTALL_DIR=/opt/aws-cli
+	BIN_DIR=/usr/bin
+
+	EXE_NAME="aws"
+	COMPLETER_EXE_NAME="aws_completer"
+	INSTALLER_DIR="aws"
+	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+	AWS_EXE_VERSION=${PV}
+
+	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+	# INSTALL_DIR="${INSTALL_DIR}"
+	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+	dodir "${INSTALL_DIR}"
+	setup_install_dist
+	setup_install_bin
+	create_current_symlink
+}
+
+setup_install_dist() {
+	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+	dodir "${INSTALL_BIN_DIR}"
+	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+	dodir "${BIN_DIR}"
+	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+	set_global_vars
+	create_install_dir
+	create_bin_symlinks
+}
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8ffbde7fc606..b0093faa8b54 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,6 +8,7 @@ DIST aws-cli-1.25.51.gh.tar.gz 2241823 BLAKE2B 86e7463a8fb63311351d60ac3dcd01a2f
 DIST aws-cli-1.25.52.gh.tar.gz 2241932 BLAKE2B e11ce7250040886ae9a00413c8ce67c929e90b5697a83d36184750d69d947c389afc4fc97d590c64874c2c259ba4a10b97b5d20f6148aee167d9cf6b9af6ff9d SHA512 5c5e06c9e2b0529508edc829c1baa7359238a1e72712e45e269030fd58644fde2f7b94767d1e33b1ff35859a25985f2b00b7d13c96e37dc5999bc7e24cc4f5da
 DIST aws-cli-1.25.53.gh.tar.gz 2242474 BLAKE2B 000bb154882210f52f8fe5c40e56d43526b28665a9e5666d7d8b61f95302d411a8f0d0c6eeaef3bd5aff46cfa6ae1133263dc38cb6a7274b4d7058c26005c369 SHA512 82790f15c9fdd736f2bdda976aa5990849521f7af05c95ee9c2c55cf232e140d875b396714be8be1ffba382ebf8f26f8b0a03bc064699de0316ca41156b993b8
 DIST aws-cli-1.25.54.gh.tar.gz 2252442 BLAKE2B 7f3f55af39f52be60daa039c42cd494a806998bbf0e27d5218949f0b6b8de29d85fc515697b76fa163e93e051405ac69a4df82322ac573fd124117d548040cc8 SHA512 bae88f022cfc8d596569412dfacddeed626ac88019632fc846a8351447ff02ae07dd481962e9a1495897896bb2f8b96186f8e3572bcb4fbd37d82b016afb8e33
+DIST aws-cli-1.25.55.gh.tar.gz 2250376 BLAKE2B 21a61086d4eb737229990fbcacdde652e8bd94e146a027dbdcc8fcc8ab005f6dcd4525625276df196408da3d11e0c215c602df4cf298fea3f12f6bd923f7f191 SHA512 e53997ae7475fb125e08bab90ac63b49723abd7ff66312d15145ca452c806986237f8e20fc6cb467d4654087a288b0835fcec48f7be6ec8795e90345a0983ef5
 EBUILD awscli-1.25.36.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.46.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
@@ -18,4 +19,5 @@ EBUILD awscli-1.25.51.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77
 EBUILD awscli-1.25.52.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.53.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.54.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.55.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.55.ebuild b/app-admin/awscli/awscli-1.25.55.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.55.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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 ~arm64 ~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() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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
+}