7 files changed, 78 insertions, 4 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index c8ae84e041d2..dca41697a2bb 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 305a3680d316..6cf167b298a9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -2,8 +2,10 @@ DIST aws-cli-1.25.89.gh.tar.gz 2285887 BLAKE2B 1da21b1e314b187ee105d2bf256ce2fea
 DIST aws-cli-1.25.97.gh.tar.gz 2290672 BLAKE2B 4fbff8d9747b615f7b8633ce2a1c7a68880d50d3a22c5bcdfe2e352a8ea84f8b9d0d1c94d514be3e871beeba5c2cc69853fb40daaa4fa4bfd3409779ca2713b5 SHA512 a27dab95240036158d2dc331a3b1768e7c705b52cb1fcf7f5d0bbc3f40bed62838565493c463e22cf2b249981b0fca255ce65d64b7cfa45df24621cb788171e7
 DIST aws-cli-1.26.0.gh.tar.gz 2291209 BLAKE2B ad2b9380d45d986b2cc4219a93ee30fdc1e86e35e66dc095c76f29e6062601d0e443a96fa93edbc65562580eb9815a8d3f31a59a0c850513793df3870e809be8 SHA512 5b7e87b4fe02d7fbca0482cb93616b8f78f0bb074ed779ca553532be54f914c827a30b8458e209e6fbd23d22b5e734dfe14fb79e8833c3055c771a1766153d2d
 DIST aws-cli-1.26.1.gh.tar.gz 2291902 BLAKE2B 04df153b4b7608ab3c2e86c230065f7b935a911e88e1a5b788dee545d328d9839ba9aba44b334522f2afafef8fa613aea6e749a2a7f9089f40993544f3cec9e9 SHA512 418257a8e4c92a6d21c89f7725cd70f463f4dd53c798783b29c4166daac644501e4a03a180257dfe356bf30228dedcf7a672ad46ff6f36afd40a8efd9ad786f9
+DIST aws-cli-1.26.2.gh.tar.gz 2292384 BLAKE2B 72a24a647ba73ce492f2c7c43984af2c7185da8415c3124c4d55acd81bb8bb8895d5d01232bf2267166094ba0ca24fa690c81838f28ef5b40fbcdaaa6fd93c5a SHA512 fc3569a9c81481fa2b1b04c74b89073724cea0c0f035f60ceb5a8f47f848a2a6c8e104ef1e1ed883c1d330c4b5c240c2b79e86d6eaf28c7a120d1c3cae826e92
 EBUILD awscli-1.25.89.ebuild 1856 BLAKE2B 554e1053c19d16d4e0aeccddbd3a49b42ab412ba342ddd888b11552f1abede7a405f743edbabbda0cb4d42dfc95c0f29da64aab08d09c0cf3b24b0771438f23b SHA512 563c00bd712002ea3b3771e7f6c2f27b478fb78cd91b1009cf498e487b81c8abe04e754873f77f625e56594f34e282307c325cc6609bee2f6e856d0e461aa252
 EBUILD awscli-1.25.97.ebuild 1858 BLAKE2B 1ee53dfc682ba96eb15476dd37b44e1e0833eee35faf61ccad6f24f402a9eb18590e19cad2faa40e11490c13db91f2609859cdd4bcc5caae36a89cecea3143dd SHA512 8370816db2c51b0e6146a031ea1100b47fede8d1ceb82104206f0a55ffbe995a1792d6872913e0d72497b4726f763816ba77c6215441c993554d3065a5f9d3f6
 EBUILD awscli-1.26.0.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
 EBUILD awscli-1.26.1.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
+EBUILD awscli-1.26.2.ebuild 1843 BLAKE2B 1c4942076455cb7b7f201cb909bb946c5ee231bbe589efdf2d58074413ff88fa08afec6c5b0d485bd5b24f0b997857acb0cf25eff2e78e7fca11ff2700c5164c SHA512 e1b7932cd3fb4de8d18b62c8d3cff4c0620b5997bd1a4739ccbd6914a969958eddde42ff99aeb819a3b68674c15f5cbceb768c210f5f4f8fdfb082642ca6636a
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.26.2.ebuild b/app-admin/awscli/awscli-1.26.2.ebuild
new file mode 100644
index 000000000000..7bff39ee809a
--- /dev/null
+++ b/app-admin/awscli/awscli-1.26.2.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..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 ~arm64 ~riscv ~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/conky/Manifest b/app-admin/conky/Manifest
index dc5e6d4bb02c..5cd466e166cd 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -2,6 +2,6 @@ DIST conky-1.12.2.tar.gz 2407428 BLAKE2B b8d1b40dc4b547679b5ab4bf0328aabaac86802
 DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe48275364c4d0c973da6467ea044303d75f94cc0b963c3b423a7ec61d8eff26da30c102c557ccd5a4e8cf984db4f6 SHA512 3ee0e14f6ff2bac39404c272790055ac1106f47a00e8298da909a0febf6de0661486e8ce23f34e8c5050e364168b2efcefd0b28736cbd0bc135e1362f0dc5516
 DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
 EBUILD conky-1.12.2.ebuild 4790 BLAKE2B 233fd89ef019a015d1ebad697126bd2417410241cc377a81d5bdebd85cbe1ee664ca61db8b5a83d39a8dea05c63b8dbbf7b4bf7fed3ac0b76c7ae349d477b625 SHA512 36f90f9eae1c783a02dfca917ffcdc48694f8ec9175832c95b6867bbc94def480be40abeca1d172a2a7f4cb944ec827c3dd1766b5ae8310a2aa4ef700283a4e5
-EBUILD conky-1.13.1.ebuild 4794 BLAKE2B 34c39bd8ba19b88db1b70d79f50ca71eb9329b7abedd2dd1268d9eaf2bf671a5c7ffdd76793ac5b43bc968cc853e54471df3c4a74cb66cd43fed17fe22644212 SHA512 fbb21ea3bef9cde56bce4d47517550df02ab8a8879dda7ce7127f412852dcaffaaab2a61794e9f3a9ff78ec4a197be209413a56b0f8f3a19255a0955c224a63d
+EBUILD conky-1.13.1.ebuild 4793 BLAKE2B bd580ca59a442b7bb164095cd3091742ec26b41c0d7181474f71259e384ff9147706c2ca35c577dab4dca4489b1256a58755f46120b7b69d08494c8f4db30104 SHA512 c16e1710f4c6bad79afd54187b236e5fb583e727264c5522f818f9bedc01187816ac5169a58671d9180a01347cdab58f695bb5f98c5f7e4d5ed8c31a0b89d5ca
 EBUILD conky-1.15.0.ebuild 4520 BLAKE2B 4fdb448db2b1f7c8236be63f094f80b09c786a0466c2eaec511b6b7f452c714fe0ee5e56f01235e58e6998f81ff72954b4cd387c87f58b1894bdeae405cab058 SHA512 0a8acea091b5eab390a4afb0ef2e83cef6c735fd9680045e8f6419a0e9f33f23867b4a8af1f71830e08c182281360c2e959cd4afcfc1328fd3b8219c6da29897
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.13.1.ebuild b/app-admin/conky/conky-1.13.1.ebuild
index f909139904bf..f222b7a5b8a5 100644
--- a/app-admin/conky/conky-1.13.1.ebuild
+++ b/app-admin/conky/conky-1.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib
 	intel-backlight iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc
 	mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd
diff --git a/app-admin/xtail/Manifest b/app-admin/xtail/Manifest
index 6308bf8c1b4e..fa9d58c6a6c6 100644
--- a/app-admin/xtail/Manifest
+++ b/app-admin/xtail/Manifest
@@ -5,5 +5,5 @@ DIST 20120219-patch-aalto.zip 4991 BLAKE2B 6b3e228508bb12c1e18f3d2982c1bf23c996e
 DIST xtail-2.1.tar.gz 26769 BLAKE2B 9a5c47810b2a8cd7aa4d8cc543ec9edce7a24ee446627f658063547276a43dfb72503f10c4d2d6a35f25415a32a2aa177dc5fde79e8ed834cf8ade5aaf9fb447 SHA512 a8519969ef960af97c4dcb75c679daa5687f553c909817ede1134dfa5d70ed71c5264f0e61c8c579cc253ccb7739a68c5213811169489a98e676ef8941d9446f
 DIST xtail_2.1-8.debian.tar.xz 7168 BLAKE2B c04a239aabd307f36b983b83384ace6f7abbe7215f84921da159da57b338affb9840e3bfb9886121fd140e1a412f017cfdc1f22afe2ac8484fc1d8b641ef196e SHA512 6c00f87f905a94c579085e5f18e27fce94642d0a5a1376deb618f464a9ca6bb2f7ac0529ef7a2439b28c5314de7ee733f86dda0d7577d3575ce085e2a02c39fc
 EBUILD xtail-2.1-r1.ebuild 755 BLAKE2B 31ca3dd7ee5ebeb9fbcb28be16bf5d127b4ebe813b6988a1a0c4b5e752cadd2a3f8710640db0627d7d5cc33c82ace85191b1de32d8865fef0c737a92fe020e19 SHA512 190a8e7362c30ba5d1d53048859c64194db7e40d8a4fc1bab9e061ba8747524d9b1e9f0b07b80a63d0f6b0504e8666c89a28b53c07be884a0c67f76d88722c10
-EBUILD xtail-2.1_p8.ebuild 1026 BLAKE2B 5e95f2313d1e6a6224267db52d44da9555ae7100e47e5c517634c1a45405044bad4c41441ac294a498e653a108a4c8697f8633d678a769ef1f85af0cdb843187 SHA512 76a0234f664344ed69590e7d436e240ed1f5098953d4cdfdfa8abc3ee4708f3770fd79fbad9f2c1c58dee74a2c81406f4eee8b1b02f957a71be30f4b7e0fae3e
+EBUILD xtail-2.1_p8.ebuild 1025 BLAKE2B b3fb0bb8057fa1203c6e40269910e0019782295e850dec3849eeaa979fb05676afe25bb8cb69e7f05c6e2aaecb813090c5d74e02bb2e0301fb779df57222ae70 SHA512 81f4a8c132c50990ca83fe527e22e5ffedf9ece7dc7e79b6946dc7a8b89177f80cd452d625816169f1b1cec1f95d3181c1ae0ad41a6792ca154e5346ae561776
 MISC metadata.xml 391 BLAKE2B 5e2a05efa60fb020077edf3a5c4dc026ab1ca6d3cea217c4252ae18b175a4ba5fcc7956ca079aeab704f187105839ea2f35e330567e8d47760cff23562f2466b SHA512 786871c7f378de616b4a0dfb8222fb1ec744886c2919e364f2bc4b783c46d4e6f394a463556dcae7d6bed678886c9aefb98d71682e38ab126b8f823e0d85f607
diff --git a/app-admin/xtail/xtail-2.1_p8.ebuild b/app-admin/xtail/xtail-2.1_p8.ebuild
index e93cf162e952..c9d84ca2880e 100644
--- a/app-admin/xtail/xtail-2.1_p8.ebuild
+++ b/app-admin/xtail/xtail-2.1_p8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 
 BDEPEND="app-arch/unzip"