gentoo auto-resync : 23:05:2023 - 08:58:35

5 files changed, 84 insertions, 2 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f937d25fb9ed..e03bfd02b843 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8781d6471121..722c82a6c5ff 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,7 +1,9 @@
 DIST aws-cli-1.27.129.gh.tar.gz 2417079 BLAKE2B d1de37906ba0e541ef968aac5d7a7718167b6b8683d655f9b7ec91ab1e5ed289bff46dbb56c1a6a5c4e0ce56eb4fd9ebeac386d0ec38e855bfbd3076bcac2aa9 SHA512 cd3f57c1734d73964d712a7a5d03c83d3168f2197011b014a04088fb05090948463d95c7d9321e1ae1e21992e18013fdd260b640f342681bca70f2e33e423f88
 DIST aws-cli-1.27.133.gh.tar.gz 2421348 BLAKE2B 0511291bf018bb62616f11231327b47abd153533c8ef0cdd5414d1c6f7f96ca529e3bbc3e5bb73cdb59d010502ebd122c3e83dc63bb7b4d84a6f7b011d3a03bc SHA512 a308d805091ecc054e86bd83ca5525d5332f5f6efd2654ce1242e70c7459de75d4175689381cfcb530cb7b2b43d852fb827d54ef2845cb95206ef2379f8e3dc6
 DIST aws-cli-1.27.137.gh.tar.gz 2423020 BLAKE2B 9cdc1cab324eaa2b2bc17418180bf8bec6e34903b427afbd2bceb0c35eb0923b5e7d98e42954f239bf13576b5d10b80c29d15af17e0f230ff79c244b1532a671 SHA512 9d3220b392839334bc077e0ae417b73ae2aaec363a5a3684690eabe790c062f9b428851b02cb2f27b65193c712fc149eb602a33b8f500afc81daed5cd2d3e8db
+DIST aws-cli-1.27.138.gh.tar.gz 2424550 BLAKE2B eff6712357722f6ade0fa8365f034dcd69f6af3748cd1b88be78730ecc4f7368042b9e6a1681804c68d9e8b2521045547be76c7497243e209107612d435fab55 SHA512 b51c80bcb2cd8274e4e3bcaf9ed03ac97554cea7ea5c67bbab8de318fd5c4cbb272fe914749cf57bd6d9cb69aaa2cbd325559ae9fdadb92ecde6d2d4cb532447
 EBUILD awscli-1.27.129.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.133.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.137.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.138.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.138.ebuild b/app-admin/awscli/awscli-1.27.138.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.138.ebuild
@@ -0,0 +1,80 @@
+# 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 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
+	)
+
+	# 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/consul/Manifest b/app-admin/consul/Manifest
index bc7f7586f781..a5d7b107dceb 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -8,5 +8,5 @@ AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54
 DIST consul-1.14.3-vendor.tar.gz 40650363 BLAKE2B 1c15333d1a1053da871ccf032c8b21f6b1265a5c222395f217444de3c4472c755d205bad82d83ecdb520081830d11e4c7f113207fe83a7dac4860497518d5be8 SHA512 b1764b845bea8681d72858de4558fdfce4de1faaaf1fb5221eab12d8c9f512efbf1b8a118ea68c829660e23410381a2b71d12fc6d995a64be041d74ad616a663
 DIST consul-1.15.2-vendor.tar.gz 43070821 BLAKE2B 39e375cf6fcb17e9a633aa7048588560f8efc93aacad7a332210d509d0b50a74e525be5e56ad9e0aa642b43f68362b8e28beb264c4365a96dd98eab6f4d296d7 SHA512 b00cd569dee83c7850fc13e5591c55dd2903242349ec747cc7ac8f18ebd207858148521c62a1da914610988f95cd543fcc5f5771a1c072c09521a8af0a474ba6
 EBUILD consul-1.14.3.ebuild 1437 BLAKE2B 8f13d7241c68a474973a422dfb465cd5ce2b64f791e8377d42ca22f02d0ecb744b22bea8422b789795bb7abae90eedadddaf37abf40b4a7e962af01a2c15e0d3 SHA512 2bf3a4794611500c5f4804b6b469673766327d4f9c1db76677736c65a85dc94800b724f3bc45f71c1384527285bac83e3ee5c75f1590bb23c2d4a0fd49537eb4
-EBUILD consul-1.15.2.ebuild 1436 BLAKE2B c65aca253c3ffdc50b4ac1fa87f353929f72085ab2e12611030d8bab404c5fb2d06297a943f1cde4de7a7d7785ecf29bad28141e95535273f5df9d7329797a31 SHA512 3aae4f5b38d14d94cf7908b9a3e822ac8126957f10face40c26907811f7af363c79e64037df31ac886b65021fb7ef3be4bc6681d4e5201059571f4813d989b4a
+EBUILD consul-1.15.2.ebuild 1435 BLAKE2B ea3c40b2bb7de764a6a045819056a756ad28dd1b2fad41636ff5eaaff68654431e98646bada1becb70842e30e9fd60bed9ff50fb0bc6f9173b5ea56b237389ab SHA512 58408602ce2f9f0f6fbc3147c3e23853e3dfc394bf2898b8ef804bfb265cb213047828c4468b6c810a72076b8719e6f34f21d3cfaac9089364e19edbc698bb6e
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.15.2.ebuild b/app-admin/consul/consul-1.15.2.ebuild
index 5142a830ba70..0b02a570806c 100644
--- a/app-admin/consul/consul-1.15.2.ebuild
+++ b/app-admin/consul/consul-1.15.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-
 LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 RESTRICT="test"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 BDEPEND="dev-go/gox"
 COMMON_DEPEND="