gentoo auto-resync : 16:09:2022 - 11:14:45

5 files changed, 76 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d6dc056d491a..3bd737cbc8aa 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 3de26aed8bb5..c76a5eb22c1a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -6,6 +6,7 @@ DIST aws-cli-1.25.66.gh.tar.gz 2264111 BLAKE2B 7aaa42d654a873fea44fe64e0805c2407
 DIST aws-cli-1.25.67.gh.tar.gz 2264702 BLAKE2B 88bdeab8fe85d17d7aa78ff00125e1c3e1d098093d68b7e7213896d101bff443cb2ed23b8ed9245eb3727b41abd34a8047616eee777f802d52b3a26594e214c5 SHA512 a01b333d36160a43c1f28d01600e1f1d095e4713500bac3b13fc336bf790943251fefb72dc7bc177eaf4265b794658d62ff72ee00abd348c1265d04b58564136
 DIST aws-cli-1.25.70.gh.tar.gz 2267239 BLAKE2B e20606c8b3df77698f6ad67eb28a63d8ddb5750782a5ca5a690d36bf5ec5d171aebda115a3c828fbae948037d71e11ead73e163fdaa55e81614ea245a51f54e5 SHA512 7984a56f4e224389822ebb6aa56927cc669630ba8fbebbb59178406ce1dcbb298ef0f83353c02ab37eaf4e0bfcd6b86363712d3f711540993044fa6517b84364
 DIST aws-cli-1.25.71.gh.tar.gz 2267936 BLAKE2B a44cc3995335d2556e919879127ebac77c274d6a1f55a390acb85d59d1ee3850826a9d0cc1b7d4e86cb7a5abf9ebac00a1a62aa0d0846a06c04166fa40b18abf SHA512 8c0f235a8f16404ca770ff8c157b52981bd808c25c045e39f7cca6b35d992caa921ac84f82309323b1b742ff783296a1d9ca51cb154704270940ce8a900c09b0
+DIST aws-cli-1.25.75.gh.tar.gz 2270365 BLAKE2B 68cd58d03e0712133104dbb145c6d4bcedf8925e59088d0f2c7ecb7c91beb572a3c8c33f55d95e1a2e0e462648c06cde2460e595942e8adb33c3dcab8ec6a2fc SHA512 c21de74e0ae7380a810d11bad53f0233bc50c8959f047d58c4f4c2cd23231fab34dbba1dac6096790adb28b1ca99e22e70019bcda32738df6e984b2bb46abaa8
 EBUILD awscli-1.25.56.ebuild 1841 BLAKE2B 8e87e521eb4464071ec89abd904be4b8056e6be8ed6a4b9aee005c952d5ef4da7e0468e0827e99cf1e460068fa9cff9b974cce96c0e0b87798e5a15f602ec600 SHA512 244149f5d56a3d1f5b4e8fdc3c2a15a4c6357998237cb5a8dc39e66af7aac968d61ba7a5873a10548af57bd08058b18ef3a97b335b42270fa896ecf7bc502f79
 EBUILD awscli-1.25.61.ebuild 1843 BLAKE2B 66c1d54d4e61960ab8a897b3b33818dd6266aa1b0bdd52126942546e1eff2a234bbb2f884a21643fac176af1bd26bf068211f788079dcce78177a5dddc6d05f6 SHA512 fac1bd2328e655695a83ea34d19371c2f632386e4a1a12b0ccb05ab3521b932e28bf4deac0aec9c83bbbec17338d2077e841bd0f93315a0c97286ebe21b3d020
 EBUILD awscli-1.25.64.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
@@ -14,4 +15,5 @@ EBUILD awscli-1.25.66.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352b
 EBUILD awscli-1.25.67.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 EBUILD awscli-1.25.70.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 EBUILD awscli-1.25.71.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
+EBUILD awscli-1.25.75.ebuild 1858 BLAKE2B 46c882fef4c264e87ed8b0f6eb7ca14d5d352bbe14173f73f2705a73ad8665ce0e42c83e043010da16267a444c7ba7b92198867698407f2eea244693c41ed142 SHA512 805599b5cc4f26ff5eb666d0ca1cb4dd27afcfe8ba3b29d6ce54da89347752c4dbbed39f7b6ab5c7f8f7aed8f145eafa62293431f02ca55209fc603a87b19272
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.75.ebuild b/app-admin/awscli/awscli-1.25.75.ebuild
new file mode 100644
index 000000000000..3d5bba5c1200
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.75.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 ~riscv ~x86"
+
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+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
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 03e685a334d3..41a90009c2ac 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -43,5 +43,5 @@ EBUILD salt-3003.4-r1.ebuild 6933 BLAKE2B c99f429003c7992c9b9271413ce4929c2e4a3f
 EBUILD salt-3003.5-r1.ebuild 7019 BLAKE2B 950714a06b7eb3f531c2a00cd8c58283db9750567b3f4f5434123b1bdbc57c19f97de507f8c307f200a92c6659167024aa2dae736ef4b061f7252337d3be54c5 SHA512 9ca17e369d90f7e52b9809debfdb36a6ad8d1049ba5ac585ead0d2281903d23d276af75356ffe3fb791e5c7c3a3f1aa6f26c1f6215274aa2c1136175d72725aa
 EBUILD salt-3004.1-r4.ebuild 7044 BLAKE2B fd253f8e588516e95519f0c503993887305952541dcbc3a62577a47909bd8160c6f2f46043843a3c473817f85bb8e2fd4eac6aea50e299a11a12f0ba7eb76084 SHA512 45d34cf7e65102f1f3c70a922b07cd419ad9fea8af9407cd6c2a84308cf9823bb31e7cb39ab0b4bb4b572025bd83a8e2a916353722e16b5bbacdb4d2d225d75a
 EBUILD salt-3004.2-r1.ebuild 7129 BLAKE2B f5c1603ac1f19c1c16ece90ad050cfedfeb5c1a881212dc6462923dca712cdb669c129bb98e184f7b7bd0efe032f15cf7aca5d39eb8d2b96dd4ea96a37743816 SHA512 40f618a45a71a64a2ed6688b5b5d6924343cba032cd0faf0485c0666bf28a911e983f8060e99ac7f454624038bc27eb97319c30abe10bae9c3a1bc7346732685
-EBUILD salt-3005.ebuild 6920 BLAKE2B 3e90dbf69321e73203d490b7fa84f615b943dd174715f2531759aaa98fff7cabc0c95672d802b3f9708e6c45df53bd9001c82fba10cd65e08f9c8daf60e94b10 SHA512 900644aaf7d41404a543da116bb3c986993d4871e95d0ac0cf50b84771f2558ed9722f356c94919197435b39f24c5d07413147b87659604c89368a9defd8ca27
+EBUILD salt-3005.ebuild 6937 BLAKE2B 0808e5711e77e4bdba765530380c1a5fddb7856eb41c83ea80352487809faac7e7174ddb5adfee361adf8e93e6d10139187d97ce983321cf8a2419ce05eea168 SHA512 1017eccc1aa17fa521e91c6db363672672a34c1badf78ca47761381c19dea7f9c7397ffa952bd942d291ebc75b736336189c9da4f8acbb299d49af228b5fdc69
 MISC metadata.xml 2384 BLAKE2B 8ccb0cbfc8d0944e684f979731884c354655d28fd9029f8d9abae1a313734102952fb817617d54032dd5cafa64925d73ee2a3e8a38ae16d2ff9c1af8c53d514c SHA512 6a4e1b8f2e041ad1a83bf2c85c35ac30ae7db3a20aa868204661c1dde9abdfab1dff1392e2dab8a844472434b325355fea71702229de99f7751e841d063fc0da
diff --git a/app-admin/salt/salt-3005.ebuild b/app-admin/salt/salt-3005.ebuild
index 08bff04ce91f..9d6aa316cc1f 100644
--- a/app-admin/salt/salt-3005.ebuild
+++ b/app-admin/salt/salt-3005.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="Apache-2.0"