5 files changed, 87 insertions, 5 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f905c2c8f520..d2a171cfc233 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 5e102b873087..3c55f5d5d359 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,6 +5,7 @@ DIST aws-cli-1.27.32.gh.tar.gz 2328348 BLAKE2B 0958525a47f6dac8422dd37c9e099c2bf
 DIST aws-cli-1.27.33.gh.tar.gz 2330168 BLAKE2B f5edc8494ba8b66c9819dd2b9182ab3bbc1f91c1114222e53ed890706c7d6c63adf31f754d85526c01459d3910b7cde5cb38f7e29c1821f086d3b94b9003eaec SHA512 d5e0e18804c7cbc549ba8d8cf4fa6a180f78f0681d09955e96874e0a67a3c3de2a1397995a62a9df14b08425feef6d625ae61522dbe38a62ddf9cb7e72d786d4
 DIST aws-cli-1.27.34.gh.tar.gz 2330530 BLAKE2B ee58a6cf4b2fa66c308a479222d13bdb1140e61c591c9d0bc452ae823a2d6a6ed14adb72cb6316d21ca26e33476fecf45f1484346924c9db2a4e7120d586babf SHA512 db9deda8021cb30f597f5bf96e0312bf3a0046da82a894663bb79549857b745e3676340997c0eb381e170d89e177d938cc1e93c0371b364bd23533dbdf39a344
 DIST aws-cli-1.27.36.gh.tar.gz 2332507 BLAKE2B 215356ff11388b5ecc3c71cf6a33b7a9e23449fd88bc4342aeae4660a17b2348f736d646b34eb343a4fc0f4d990d7b39d43de3b21d3b8b4bc1bdfa0f37db2fb6 SHA512 a84bf8c636d39ced6e1e5153e8eedc1db8629cd325236b5c9ab5cd39b59105f9f906822955318bec99062f438ddb118e26e5aa4e50d2e1c2397249b64014288e
+DIST aws-cli-1.27.37.gh.tar.gz 2332965 BLAKE2B 9c855f02bc63f64e3d9bb706139305a6b3dad523bd2563c9d6ca4b39b340ea242bf8e85ee369ca92d327073d9eb0a4f0e3da59b4016eaa2ce4f48aa083cc9c51 SHA512 3f53d4c15244019d1773486e192bda4ca69a9afe8e32f2fcfd9f56affc3bcc84e15a1aa4b27563f404bc5471b868eabc74c8fb3884deb0372d61a038e101202a
 EBUILD awscli-1.27.20.ebuild 2278 BLAKE2B f4f49e0d5fb6023363e07a0b1f520b1d37adfaa54bcf2bc64944e5f9274441de180bd50165dd0fcdebc8242cb4ca9d508ca5f7ad833b65934b9666f44382005b SHA512 2e4deaaad93718512fa5efc816e4bd2e20710bf7956c29423e6a8a437cea276625872d80cf0baf809d36f4958ff83bca8358ead7e62ff4d95b2321913277486e
 EBUILD awscli-1.27.29.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7afc0d65d48c37b6ff27e52661713b542d6e57424e2dee0ca8a610bb644ec4b5bf2edde67649492b421562dbbbf SHA512 12a97cd2087bb66006dd1d49b7fdca4df723071cd5e68a592839bcb5ac1f9059e26d7383e8603da359486ac2cb53a722c8a569a4608073585d9aa4ade528ce3d
 EBUILD awscli-1.27.31.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7afc0d65d48c37b6ff27e52661713b542d6e57424e2dee0ca8a610bb644ec4b5bf2edde67649492b421562dbbbf SHA512 12a97cd2087bb66006dd1d49b7fdca4df723071cd5e68a592839bcb5ac1f9059e26d7383e8603da359486ac2cb53a722c8a569a4608073585d9aa4ade528ce3d
@@ -12,4 +13,5 @@ EBUILD awscli-1.27.32.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7
 EBUILD awscli-1.27.33.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7afc0d65d48c37b6ff27e52661713b542d6e57424e2dee0ca8a610bb644ec4b5bf2edde67649492b421562dbbbf SHA512 12a97cd2087bb66006dd1d49b7fdca4df723071cd5e68a592839bcb5ac1f9059e26d7383e8603da359486ac2cb53a722c8a569a4608073585d9aa4ade528ce3d
 EBUILD awscli-1.27.34.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7afc0d65d48c37b6ff27e52661713b542d6e57424e2dee0ca8a610bb644ec4b5bf2edde67649492b421562dbbbf SHA512 12a97cd2087bb66006dd1d49b7fdca4df723071cd5e68a592839bcb5ac1f9059e26d7383e8603da359486ac2cb53a722c8a569a4608073585d9aa4ade528ce3d
 EBUILD awscli-1.27.36.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7afc0d65d48c37b6ff27e52661713b542d6e57424e2dee0ca8a610bb644ec4b5bf2edde67649492b421562dbbbf SHA512 12a97cd2087bb66006dd1d49b7fdca4df723071cd5e68a592839bcb5ac1f9059e26d7383e8603da359486ac2cb53a722c8a569a4608073585d9aa4ade528ce3d
+EBUILD awscli-1.27.37.ebuild 2285 BLAKE2B eb1371b1415262f2bde8422cbb8893720d81e7afc0d65d48c37b6ff27e52661713b542d6e57424e2dee0ca8a610bb644ec4b5bf2edde67649492b421562dbbbf SHA512 12a97cd2087bb66006dd1d49b7fdca4df723071cd5e68a592839bcb5ac1f9059e26d7383e8603da359486ac2cb53a722c8a569a4608073585d9aa4ade528ce3d
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.37.ebuild b/app-admin/awscli/awscli-1.27.37.ebuild
new file mode 100644
index 000000000000..caea725bbca7
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.37.ebuild
@@ -0,0 +1,80 @@
+# 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_{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/sud/Manifest b/app-admin/sud/Manifest
index 7deb32b3dc85..41b926162f14 100644
--- a/app-admin/sud/Manifest
+++ b/app-admin/sud/Manifest
@@ -2,5 +2,5 @@ AUX sud-1.3-fix-build-system.patch 649 BLAKE2B 00563b734e50ef85636603e09b32f9db3
 AUX sud-1.3-use-system-queue.patch 1544 BLAKE2B 4018e6a33c8457d83d3d734d8abea305eb2628dd28a43461282924398d4d2097ae281ec6689e24d92361d64a376cc50ea5427a9b5cb759245a420f8f97aeefd6 SHA512 4ff57f937a9104f6a935b32b540f34ce51a83c014c6d06dbe11bf062c79f001a14566e42ea7f0b533f4dc1421b6a28c79fbeaacbef27a296521b27f4b9f1dfff
 AUX sud.rc6 387 BLAKE2B a1eef9ef30a73c15ea8daf2f2a266cacbcf38dfc2fda1e481b9693c24c5fe5ba726a9154b8dc4a072aa008d5d96ec820f8b1dff375b16ef28f5b5230961fbac1 SHA512 07feba04e36df02e5cab6260f5943d4a72c3549a604d9db33a2f4734b39a60a3514899c0831bf1fe5ce073889989d42f0ae64d1f7bb0735fca7fd2584887364b
 DIST sud-1.3.tar.gz 117542 BLAKE2B e9d28c119e25d3cf0434d10c04d34fbdd0a52fbea84ee09b2dc835ec9eabf30fc91895fd691febbf57590b790febe04b1b45d354f7e2fcab513608de85419746 SHA512 54b58b54e665133dcc40f00708a929bc038df1e2ce18514d830e3f3f823110bd27a209771fc378c2bcd372692e168f55150f12893e2fbd433b51e2173dbd410e
-EBUILD sud-1.3-r1.ebuild 827 BLAKE2B 89bdbe9d6110cfd238301f5d6bac5edf1c21c889f0266569c1ace2fa6f2653b19a73b07c1c6e363d6177dd4ccfba5607a03d3c392dc566569f669a9cfd886fc3 SHA512 193d1218f08b6f31fe2c52bad9afbdfd2dcf63e378ffe6c5289d90e31ed9ff097886d4ea6a0432b02e9db14119438b7157390a46af7a25c1a4ae26df236d4741
+EBUILD sud-1.3-r2.ebuild 835 BLAKE2B a8bd01941e213fbb9fce444544805c22d2ae3edca8154b4baf474958c3cb4ac0e2b1eed34fee3861f62fd7f86a346ebd3f22bce1f3fc3420e05bb8b73a5ab6c9 SHA512 8eed2698d15ae021d9e31c547bbd16fd223ece8d00b6d610d681dc24315c7f14a9ae17577857b9fd443d7b60a3e3d25db295f76527698fcd490dfdd39de97e6d
 MISC metadata.xml 720 BLAKE2B aa97353214fcd2beea5ecfc2552c46a35100e9e3ce91badfdccc9c4b84fe813d9b42f6421b9cd99522a30ca1dd3f5f50fded6a07871b57d5f3b91321c4791366 SHA512 8e635784e1fd55695b509fac93e34bc42564399643989e0447db1a1ada32e43db34692eacfe56cfe1c90eeb2394c7c19cd43a1ebebd8da6ae5e03fa3d5903d8f
diff --git a/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r2.ebuild
index 8b715d598fab..f70d17d498c8 100644
--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ b/app-admin/sud/sud-1.3-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools flag-o-matic
 
 DESCRIPTION="A daemon to execute processes with special privileges in a nosuid environment"
-HOMEPAGE="http://s0ftpj.org/projects/sud/index.htm"
-SRC_URI="http://s0ftpj.org/projects/sud/${P}.tar.gz"
+HOMEPAGE="http://www.s0ftpj.org/projects/sud/index.htm"
+SRC_URI="http://www.s0ftpj.org/projects/sud/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"