gentoo auto-resync : 03:06:2023 - 09:30:55

6 files changed, 86 insertions, 4 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 0ae367044d67..6340d1299a01 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/apache-tools/Manifest b/app-admin/apache-tools/Manifest
index 2418db306bba..02be039a0317 100644
--- a/app-admin/apache-tools/Manifest
+++ b/app-admin/apache-tools/Manifest
@@ -7,6 +7,6 @@ DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B f9aaf5038543aeec79d5b8615b1b2120fe3219
 DIST httpd-2.4.57.tar.bz2 7457022 BLAKE2B b33b51a741acd308ef4d4bdd2444d43eca9db68676fa67ec907eeea7384554f3f9a5608fc43dcf5819498264bbe36f176f30be9809474307642b70720036b88c SHA512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155
 EBUILD apache-tools-2.4.54-r3.ebuild 2660 BLAKE2B 8bf80b78241207e068e1960b2e1bdd84ff7a41dde35ca1065d398652c71686f950fdd335e013b0297b9d62a85f161bb1406941902a2bd18f069216bca7b0f403 SHA512 cf807f4de552193cd826b74b6f33f3a9431b261814f63c5c0a7ad4cf6e1b046e559183e20bed337374cf91b5bb04aee9d56bbaa3d2909a1731f0b4b5922c8a61
 EBUILD apache-tools-2.4.55.ebuild 2660 BLAKE2B 8bf80b78241207e068e1960b2e1bdd84ff7a41dde35ca1065d398652c71686f950fdd335e013b0297b9d62a85f161bb1406941902a2bd18f069216bca7b0f403 SHA512 cf807f4de552193cd826b74b6f33f3a9431b261814f63c5c0a7ad4cf6e1b046e559183e20bed337374cf91b5bb04aee9d56bbaa3d2909a1731f0b4b5922c8a61
-EBUILD apache-tools-2.4.56.ebuild 2665 BLAKE2B 0542a51ddfc49a7b85d6a3b03635ab9af6ebffebaaf3fb5178f2cbb33a737e461815453fc952e8e44a5f9e7349ee6d4f932df4ca30e54d1b75639bbeaa5c21e9 SHA512 274cd3fbd5312aa0a5580fc90f9b22580747349adcd2e23f253ffd267dc07497784924f3b0e5cddecf30a999fb960f73a589b34af6a0e051acd5e218ecb899fd
+EBUILD apache-tools-2.4.56.ebuild 2660 BLAKE2B 8bf80b78241207e068e1960b2e1bdd84ff7a41dde35ca1065d398652c71686f950fdd335e013b0297b9d62a85f161bb1406941902a2bd18f069216bca7b0f403 SHA512 cf807f4de552193cd826b74b6f33f3a9431b261814f63c5c0a7ad4cf6e1b046e559183e20bed337374cf91b5bb04aee9d56bbaa3d2909a1731f0b4b5922c8a61
 EBUILD apache-tools-2.4.57.ebuild 2667 BLAKE2B 9dbff91c1ddebfef9df63ba9c3820378a6a469700d61796808810c5388cf17b191898620620e1a8c8d906e53faeb1b29dba8e408b4d856d1147554aa2269260a SHA512 19ef52f7e11fc66cc89baa138f47be339cc97fca53703e81c41c159eb1ae3089c63181de03dde7060c0edafa8e8840ad1d5a9a55cfec06556043387828e09367
 MISC metadata.xml 557 BLAKE2B 2453755857cf2e46c2df17a307b095ad2b7edaa4e87363964a0bb5e3dedc9284e09c41256f24037f8d680fd3b87e906f18ffd0f8358025fb0828ea0871229731 SHA512 d7f046261c3bb8529bbfaa7e8e47a304341c397dea4d0c276696a5c32b2fa12f0af0f73ed7ad435c3548a2a167230f3abece216e3cff7440fe0cf1498b7c8819
diff --git a/app-admin/apache-tools/apache-tools-2.4.56.ebuild b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
index 3c930fcb15ac..9db71d1c9ca8 100644
--- a/app-admin/apache-tools/apache-tools-2.4.56.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ssl"
 RESTRICT="test"
 
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 1a04d581400a..fc4cce4b0f1b 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.27.142.gh.tar.gz 2426758 BLAKE2B 587791e0102d51b9681718a71c1225c6
 DIST aws-cli-1.27.143.gh.tar.gz 2428987 BLAKE2B 3cc1d312e2a5cb4187234615d42f69c1296ad810a317adb2ebce05514168aee5b58b9ff0240e84bd31d4000d6f6cc76d476bee739ea6d394a833ee25ec422dce SHA512 f82634435ac67ba1cd2b43913d86c66ebe0dd06d40a708ae63a2bfc150a9733f1c80ff82362b48834ede5bba317c970d88d5e70d133860bb0ef022fd00ac07a1
 DIST aws-cli-1.27.144.gh.tar.gz 2429624 BLAKE2B 63b447244a5e1d110d30d69d02c6f895fcd667870c25e7f85abb0f51c47fe7547494010930bd0167861c187a0cfef3d298e55e83d1aaa77614687ee90b69da35 SHA512 979a38e3b089258d6828d55294ac5ba664df8b1a62180a3ecbdd98e0554676952e785c6ee917ff31eed32ec36cde0e08cf8cf98489eaff6b2242d6923493d2a3
 DIST aws-cli-1.27.145.gh.tar.gz 2429805 BLAKE2B ea5b6c44dc96cca32037a68de01c613c6452cb654b135688ebfc926716f9eaeba2a6fdbd708859d0f9a5fa64b2d110d65196d85aec56188861714ace0b3bb43f SHA512 e019c06de19fcde6a4a191291076fb109c5bbb80eddf74aaa38c64242e0700dea030927e9bc5d95183eff728737084a03af732ba6f6a8ab9f9e6f21f9f33fd73
+DIST aws-cli-1.27.146.gh.tar.gz 2430455 BLAKE2B 5e59ad0a5e97b4f218c694a6c9df3fb85dd7682fc1c3e549e9bb38ef3f89f63ef4976f539134d744ef3acbf9a506ddbb2b1cb93c44e11460e96db05f0fc02bd5 SHA512 e942c2ba2abba21eae87ba2f88f727c7cf77681232e2aac9c975c07ba4bee41a10ef9044f3828ce61271a569e71469420d6b4ee7ec272fc8ea7132a597450d23
 EBUILD awscli-1.27.133.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.27.137.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.137.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.142.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.143.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.144.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.145.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.146.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.137.ebuild b/app-admin/awscli/awscli-1.27.137.ebuild
index 62c19f3a63fb..2d91a172182b 100644
--- a/app-admin/awscli/awscli-1.27.137.ebuild
+++ b/app-admin/awscli/awscli-1.27.137.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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-)"
diff --git a/app-admin/awscli/awscli-1.27.146.ebuild b/app-admin/awscli/awscli-1.27.146.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.146.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
+}