5 files changed, 76 insertions, 2 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 940a26074ed1..4665c55e2e0f 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 439b20c1f030..2d728bac2cb1 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -3,9 +3,11 @@ DIST aws-cli-1.25.36.gh.tar.gz 2237211 BLAKE2B fbab136a1c1211646c1213357cd80068d
 DIST aws-cli-1.25.41.gh.tar.gz 2238897 BLAKE2B b0e4d1b96048971f41a0fce9c9149154778177ec8569f467cd210edaa063d629ea6998c1ebfa4506f8b2cca65caef7f73b307ef6aeec683801045c6121f85a8c SHA512 712c237181b166cdf1148ca4b3588a92939dbbfbaa5cdff9bffd8e2da35089539ef3b0b0ba271b234918796cd5fd83bf2a59e29c974f9e341d0e42e05bb8b69e
 DIST aws-cli-1.25.42.gh.tar.gz 2239243 BLAKE2B 081535dbe7dac01101b570ef319af9c1bfff6ac1eb1dd000d9f15906a1538682dd77c9d6c78ee38db0f103c3681b9a9b2fb3954be0e5f6a11dcd16e54c33b79f SHA512 6d771f4e4235da349905ef0df1a5b118877425e9192ae5eac3b711c63a4ef80c491476d6a14440af19bae01e51c7a86fb6dd0efe976d11fa0bec2d526ba0e0b1
 DIST aws-cli-1.25.43.gh.tar.gz 2239407 BLAKE2B cad8350671679b1314f22ed0a21b1933b7fb960549b16d1ec60ff6e2bdaf91f943fe108f54521a538cfe558aa7185aeaf82b353da4b83026856578df1cb70d13 SHA512 e62ead7f3e1d8edef20bc8781304a3cec507807c919f70ae0dd59634e9d5af271e040d05117739eeca48d148b7d89d7afb3798a8bae7a26def343fcf419e31dc
+DIST aws-cli-1.25.44.gh.tar.gz 2239578 BLAKE2B 26a8fda0d12f4b46cf82189c02cc6a17be25e7c2bb2de82821ed6f93e4d02c8c178eaea1eb67fec3c3c012fd3cd2368f3e969c7eb69f40de94c56f58a79fe649 SHA512 08982c0c74028513a7bbf7141fe3b4896f2dd32dfcaf25f1a959feaa0ed0456fe39a5548324c928bc8b75aa7d5360fcf2d647b5f9797695701f6bd2a8d6575b4
 EBUILD awscli-1.25.31.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.36.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.42.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.43.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.44.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.44.ebuild b/app-admin/awscli/awscli-1.25.44.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.44.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
+}
diff --git a/app-admin/pydf/Manifest b/app-admin/pydf/Manifest
index 4b959c600163..af4d79c82c8b 100644
--- a/app-admin/pydf/Manifest
+++ b/app-admin/pydf/Manifest
@@ -1,3 +1,3 @@
 DIST pydf_12.tar.gz 14207 BLAKE2B 9bd972529c38380b474fbbd82069e880d950cb5b9ef659f82cfb19417447abd16ecb049e0f6df3354e39c404b06dd7546296289633a4d77b61c41a5378a301f5 SHA512 5a5819b83fe2425cb951a139b38b1b639d17e1d17c4e3e4a80fc4eb6d5632c42b03a2767e1864c8bee13dbd72ebb91ec79fefde1ba448e2af9fc4a314821a3d0
-EBUILD pydf-12-r2.ebuild 760 BLAKE2B 12a6bd2d2bd414a1c8ec3e133178b01b7bbf4a62973bf43513ba44cdc8b1d69e62b82a03f36056f8e3bd62a0f52395c4c1d4420a7d1368d39dbbea86c5eb4bed SHA512 c6e0a0282082922f863cb387ffbb6f17f449870bc5d398c1ad5d0cec7cdb1f8d370b5e5aeb691e3b6d7d4b3a46403af0001af885bda8fb430273b2b044a00d77
+EBUILD pydf-12-r2.ebuild 767 BLAKE2B cc83b183e00713dcfbdbf91b9b83ab80bea1a644030b6dffaf7fd0c9e789abc35f20c6cbf7195bc4adfc2f06f71d1db7f973be00551dede3c14f3d777555d1a5 SHA512 ba3f8f60d5b50f7abdcf75638731d0c74a7dd10f565360e78de262eb691392e4f9e1826e676069e7a2b1b8f89f8b4d76dd11849252086154068622eff8236808
 MISC metadata.xml 252 BLAKE2B 8f2e88684cd606ebc706b4e8bf466be2e06420edfc6fcddda38c60beb4e61a953708892650a5fddfc15292ada69dbf91e8e93f7b67ade205cb599a08f6813418 SHA512 4068eb10878300b604c77bbdd87052cdb8c976f220b3117bcc1f6b0fc79132503ce96e811f01f994388afc306f0eac49f34668da24ba344c966861bc3f0a332d
diff --git a/app-admin/pydf/pydf-12-r2.ebuild b/app-admin/pydf/pydf-12-r2.ebuild
index 76d281b91643..b37578c22046 100644
--- a/app-admin/pydf/pydf-12-r2.ebuild
+++ b/app-admin/pydf/pydf-12-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="${PYTHON_DEPS}"