gentoo auto-resync : 25:09:2023 - 23:26:33

21 files changed, 41 insertions, 1288 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 8264ce5a96c5..45fefbea8d35 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 60bd6c00366c..d7124d4f08f3 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,37 +1,5 @@
-DIST aws-cli-1.29.30.gh.tar.gz 2509672 BLAKE2B 4c81e02da68497cbf91ca407389707e21244147ec740344394b5a8dac9e3cf95d3f48487069371bea607ea823a6c7c169c9d6ed77dc5ba92cd3545e5b9510c69 SHA512 69120b9bf222257eab809cb345a3aa0515d6f9b06b64b1233fc82bd3d26341b549e43dc301e0c70876ccac2ebc7a19f68f4f7c3872ea63add1e797e49fd156d9
-DIST aws-cli-1.29.35.gh.tar.gz 2513024 BLAKE2B 7802c0eda498235938c5f409076b7706fd3e20e5f337d81366a25bacff9564326acb3edd0d8b1fd36518623a1e6d48d7ee2ee897c8669a3c1b41b8ff202fe9ba SHA512 63a4c20c494dd935dc8f52ddc1d610dfd9fb513f0d262acdb0c85265558d103962c42c757e1e4fd18a70af725186fda7b3caececef574ffa71e89f4c7164d01b
-DIST aws-cli-1.29.38.gh.tar.gz 2514130 BLAKE2B 520d86ecc116ac106b480eea03e71ac89a236f4ddacd04a0cc6ad053d5b893df27cd7a9ab11a9902cdabeaf344ccf452c5d87bfe91694e756851a0af77ec25d5 SHA512 3dba9699066fe1d886801f0d68ea426f76904dd6a147c1e23f816dd06c677ba2675881fb677b71426833f0f0c364ae003e19dcab1490ceabb9a593bd153897e3
-DIST aws-cli-1.29.39.gh.tar.gz 2515251 BLAKE2B 64324482a795d1d537953da21717faf952cd59b1473186cead596577f7089efb77a5803e5c57183ea5223ab10bc77910d0a13b6e94597e389ff09088e4df72b6 SHA512 aa1092cd35e4cb71cc7568bdde1bc3dbae5999b07f977bda0ade6fab00f87d825f8fe8165e241b3185d149d652684c725c1ad43260bf848d94cb61e8a46d16bd
-DIST aws-cli-1.29.40.gh.tar.gz 2515692 BLAKE2B 1d7b93da39719ddd4813973f9b06f9f979ee043d81135585da627d2894254d8f200b9da9d29754a9270fecf948c47c97f3209ea47d5365a6af5d2a78526f6a07 SHA512 f0c55077f2e7f87990b0304269fe93835574701eb533569f773be407e9b3d0cca671b699911d9e2c728bd9c2181c298a92eb4f4a791d940964e52e66fa493863
-DIST aws-cli-1.29.41.gh.tar.gz 2516949 BLAKE2B ae8b2c2c47b72832a038e883fdc6e15d2b59ac520203a21a1093f29d84131d054457700e59d3184768d1040f84708a73c4dac85fe2b1e99e121924c03f9b1ded SHA512 c48d16c577d4d3ac1038f33c716db6b9a61241a595b37105cde0841c84a3157f3004aaf8fd1ff95ef9b64837f8ab4c50cd875cd36154b4285bf01315b817b283
-DIST aws-cli-1.29.42.gh.tar.gz 2517766 BLAKE2B 88f70820385eb6930b8f4cc3724c3823019ce3de419689a7d2b400ec1ee66cb76d325cfc2ad6d5ad740003f2ce53fff198f470e69b79697f17b52430e8cc704c SHA512 3e37c45189531045a44e9b6295a1618f3fa321c89681956e362dc7675e94616a33734e8aa644e6e2236f72979bd8f1a7ce5d95e70f684bb14c2e9a5bd1c2aefb
-DIST aws-cli-1.29.43.gh.tar.gz 2517922 BLAKE2B 958a60e055ad83b8ed69ff0cb217d75bf7b2714fcffd1ad56c9929502c698d5d98f421d6bb7c34b9134c5a8ef8b792f2077ebb862e1b9f805eccf7a1acac9003 SHA512 9ce4b4cdee3dbbf6c75ed222fe1f34504a1b7d7ac3dfde18e4b341044a6f522653995bfda9dd891c84bf05672e62912b370060b6b7f77aed12c38bd5e9a06067
-DIST aws-cli-1.29.44.gh.tar.gz 2530834 BLAKE2B f2cb6eb13deb07b3f4ad3e7c5cea71d716092ac96a92201ddc0703d1a1031843900d697be1bceee1d05bd5443ff2ef6086717e97b49c3e550f53307823b3efe3 SHA512 0ef736b2ef43822f66da01ee4090df18b6e837b4a37b86ac0bdf45742eda0ec2f7b9bdd494d3642585088cfcb4dfec8b2a46b3b9ae76aa427fff6c8e82353826
-DIST aws-cli-1.29.45.gh.tar.gz 2531194 BLAKE2B 458c6a847c67fdaa882154bcb0bf2744c5f15d811d82c1da221b9fbd10c300efe1ba58795bddd991e2768056b369f428efeff690fc0323ab466ee0f6c10066b8 SHA512 e34730f78b2580637fc64ba1e905ec8b3b107031d0a2fcf6baf0805ede2f8861ec32ee4b43b77d68acd74d2d2d8f88cd8286b9025dc346fe04d0168987a411e5
-DIST aws-cli-1.29.46.gh.tar.gz 2531529 BLAKE2B ece1fe47627f1034a8e4c29780cef8b9055776d9477a4bdf63e06e461391ebf712609dc007c68de5c42906e1a02606399bec2ec83045f86797c33051e72316bb SHA512 345832da8b760be4bb27c5f32ac1ffad14369fb1ebe4da7587308f3f3978cc7a8042e34e887300e7d1626e38c6fba1e213f623a8ad717372d381ea3c0ef95b3d
-DIST aws-cli-1.29.47.gh.tar.gz 2531859 BLAKE2B dd7ae6999c33773d8b1dd9869a7ccb8c79f364e6d1bc77e6ae4dd9b7159896ed85217b26029c5d1b587d4bdfe0f68d1ac87c0050dc7f734f2ee8c39f5c8e87e9 SHA512 75cccfe7221fd6c3166e60d23fe7971ad5d54749039383f88b24acd6b51c87b21f19e6fe4872cadade19acedb1eea99dbe9a66cf1a33476e8c35b1585bca1d68
-DIST aws-cli-1.29.48.gh.tar.gz 2533414 BLAKE2B a7089339eb48c01ec8b2e8d6db3354c872d1b5b4f7d8e005c5939e26ddf677480e455691609ad1ceb2d5c0f6bf831a5a1f6503fdab59ccd0398b0429173a7f67 SHA512 68c6f20eeb7eef12edaf9259aa425d4132a735c804d8dd79ee5276ebbfa9bd7b63877db11a2190ac6abcfd6aae7ec1a7cd5a17159de7d90cf4abef146128d5b9
 DIST aws-cli-1.29.49.gh.tar.gz 2533689 BLAKE2B 0ead02f739adc66eed988bedf41b9b508c553a6dfcea07af022a5b3098e8a3f65e4fc59e512b3374b3f1fcf89ba30f0dcca20e2cd6638c2d2b37b09646f1f4ca SHA512 336e012105d295dc69734fbd9f47a9cb6f2a54fc4dfac388e52e24519967e0aab5e3d98920f8ad05ea242e39673b6a8f98bb9af551507ee0560ee7598c9f86ec
-DIST aws-cli-1.29.50.gh.tar.gz 2534012 BLAKE2B 1089a689851648125e0a04f4ec004bc141059201a8e885db3a88ac3912b47997af797e21ce8d759be5ba03a0a09d278c612068a8cd55eb4b9a971b11077d5175 SHA512 4dfd35be02641b77c3f4047645a7d6aaada62550ac725e1aefa154dbad15839b19fb222ea8194f919823d25b3a30c8275f3760dbf7d0828b1b1fa4537c2c26a4
-DIST aws-cli-1.29.51.gh.tar.gz 2534506 BLAKE2B 79ff26738b1008b3b19de7d4838dab11711d540f147fb60eb13b1d820f50dcf0544375cc7e37a9a6571a0931593ad1de6416c4e54bbcd27ab9e89a8b702303d2 SHA512 537a395f99d6b7fd9d4597f719dbf151620fe9f3c747e4ebaf54f63e2943621faaefe4ce1f278b09047e381da865e27ad394a166035ecace742f3294d6cc58ef
-DIST aws-cli-1.29.52.gh.tar.gz 2547970 BLAKE2B 49ae8ce6051907b13c7c4eb5d5431e652050617f469cfc32ef70cb6ce7db335bb0ddf9105909705c840c693b7857f9e7396d983c6cd0a13bfadb210421cb83d7 SHA512 ccfb02b66854f4fd288086f1f9bea7f6ff8aa67e20ff253e0483e2133204be4efd3b50e87398feb68fd7852fdb53d4ac31dd2d1548248608b6a5351a618b0458
 DIST aws-cli-1.29.53.gh.tar.gz 2549518 BLAKE2B 4c9932ddbfb5f8619006589c0ed8f00b5d0230bc9d7fa811875cc4b16e9b5583a3abe4ccbb290524565dde2f78ae5696162863ea6e5224517c98414d7cb74344 SHA512 1150c20f5cc3da3a0ba2e25741441a7db8b6e399a927366902b30fd30a394634d015cc6b53bbfe7bcb759ce0aec6e0f9432a23e5b8d00cd9c2bb71afd5744627
-EBUILD awscli-1.29.30.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.29.35.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.38.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.39.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.40.ebuild 1911 BLAKE2B 01f63751aa4df11832a25c3ce256de60b80d4842d06670f346a921a6ba520686a4fa00a090aa5c6f8514e78e47512a1f2cb6f1acc5ff738b7803158710b0b28f SHA512 0e3920cfd0d9be1aba24eb714837d558016ccc7cff2f58e7b9a772ecd318d56880ac9b04a8647d2ee83de8437781418f8e63a1f5e913718a64ddb0a860e57cc7
-EBUILD awscli-1.29.41.ebuild 1911 BLAKE2B 01f63751aa4df11832a25c3ce256de60b80d4842d06670f346a921a6ba520686a4fa00a090aa5c6f8514e78e47512a1f2cb6f1acc5ff738b7803158710b0b28f SHA512 0e3920cfd0d9be1aba24eb714837d558016ccc7cff2f58e7b9a772ecd318d56880ac9b04a8647d2ee83de8437781418f8e63a1f5e913718a64ddb0a860e57cc7
-EBUILD awscli-1.29.42.ebuild 1911 BLAKE2B 01f63751aa4df11832a25c3ce256de60b80d4842d06670f346a921a6ba520686a4fa00a090aa5c6f8514e78e47512a1f2cb6f1acc5ff738b7803158710b0b28f SHA512 0e3920cfd0d9be1aba24eb714837d558016ccc7cff2f58e7b9a772ecd318d56880ac9b04a8647d2ee83de8437781418f8e63a1f5e913718a64ddb0a860e57cc7
-EBUILD awscli-1.29.43.ebuild 1911 BLAKE2B 01f63751aa4df11832a25c3ce256de60b80d4842d06670f346a921a6ba520686a4fa00a090aa5c6f8514e78e47512a1f2cb6f1acc5ff738b7803158710b0b28f SHA512 0e3920cfd0d9be1aba24eb714837d558016ccc7cff2f58e7b9a772ecd318d56880ac9b04a8647d2ee83de8437781418f8e63a1f5e913718a64ddb0a860e57cc7
-EBUILD awscli-1.29.44.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
-EBUILD awscli-1.29.45.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
-EBUILD awscli-1.29.46.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
-EBUILD awscli-1.29.47.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
-EBUILD awscli-1.29.48.ebuild 2209 BLAKE2B 780bf6dd2cc61d02f3794c499bec6497b0c715a7427e11773d715be7f04458c349f9eec08420795a88478bfc6155d031eada9aae68995714813c867c707f0926 SHA512 a129feaf2ed7b420c698a4d3ad12622ee7f3e467d8aea80a4fa75c2700ac4861e70bca70729a6dfc0d1ac22195b425185a70d26835f64db460f943fcb0f83a51
-EBUILD awscli-1.29.49.ebuild 2811 BLAKE2B 9023a2e9d234cff26111cf9302a312e369631fead3f1f064904d693e08e2c3aba14e70740cc9b41c3ebcc70671af79cd548788c8f945e758a5ac98263163c8cf SHA512 a1abe2aa8947aa77d6386114a1ba347bcf3d473c8cb2afef7ab815e7308beada9e6c38935801695a3d8fda58c0a1ecc71727dc5b1822ae3cde33bdd2d872f5e4
-EBUILD awscli-1.29.50.ebuild 2811 BLAKE2B 9023a2e9d234cff26111cf9302a312e369631fead3f1f064904d693e08e2c3aba14e70740cc9b41c3ebcc70671af79cd548788c8f945e758a5ac98263163c8cf SHA512 a1abe2aa8947aa77d6386114a1ba347bcf3d473c8cb2afef7ab815e7308beada9e6c38935801695a3d8fda58c0a1ecc71727dc5b1822ae3cde33bdd2d872f5e4
-EBUILD awscli-1.29.51.ebuild 2811 BLAKE2B 9023a2e9d234cff26111cf9302a312e369631fead3f1f064904d693e08e2c3aba14e70740cc9b41c3ebcc70671af79cd548788c8f945e758a5ac98263163c8cf SHA512 a1abe2aa8947aa77d6386114a1ba347bcf3d473c8cb2afef7ab815e7308beada9e6c38935801695a3d8fda58c0a1ecc71727dc5b1822ae3cde33bdd2d872f5e4
-EBUILD awscli-1.29.52.ebuild 2811 BLAKE2B 9023a2e9d234cff26111cf9302a312e369631fead3f1f064904d693e08e2c3aba14e70740cc9b41c3ebcc70671af79cd548788c8f945e758a5ac98263163c8cf SHA512 a1abe2aa8947aa77d6386114a1ba347bcf3d473c8cb2afef7ab815e7308beada9e6c38935801695a3d8fda58c0a1ecc71727dc5b1822ae3cde33bdd2d872f5e4
+EBUILD awscli-1.29.49.ebuild 2804 BLAKE2B f5472cbd2dedb555c4968eff148a3e63d0395304b3d02dbc59b56bb593b7fccd64022b69a94c5e4bc5e2b0965fdc75f32beb5151ef379f98ef65d94e109fd340 SHA512 1d1359b9f28290a17fc18b2b36ded73b09edf0f80c1a6757b4f87c7b7229700decf2adf660747303820fb4ef3978ed9ca9e34427bd67ceed6312c3c0ec07ef75
 EBUILD awscli-1.29.53.ebuild 2811 BLAKE2B 9023a2e9d234cff26111cf9302a312e369631fead3f1f064904d693e08e2c3aba14e70740cc9b41c3ebcc70671af79cd548788c8f945e758a5ac98263163c8cf SHA512 a1abe2aa8947aa77d6386114a1ba347bcf3d473c8cb2afef7ab815e7308beada9e6c38935801695a3d8fda58c0a1ecc71727dc5b1822ae3cde33bdd2d872f5e4
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.30.ebuild b/app-admin/awscli/awscli-1.29.30.ebuild
deleted file mode 100644
index 2d91a172182b..000000000000
--- a/app-admin/awscli/awscli-1.29.30.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/awscli/awscli-1.29.35.ebuild b/app-admin/awscli/awscli-1.29.35.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.29.35.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/awscli/awscli-1.29.38.ebuild b/app-admin/awscli/awscli-1.29.38.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.29.38.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/awscli/awscli-1.29.39.ebuild b/app-admin/awscli/awscli-1.29.39.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.29.39.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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/awscli/awscli-1.29.40.ebuild b/app-admin/awscli/awscli-1.29.40.ebuild
deleted file mode 100644
index b11b8e9f8900..000000000000
--- a/app-admin/awscli/awscli-1.29.40.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.41.ebuild b/app-admin/awscli/awscli-1.29.41.ebuild
deleted file mode 100644
index b11b8e9f8900..000000000000
--- a/app-admin/awscli/awscli-1.29.41.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.42.ebuild b/app-admin/awscli/awscli-1.29.42.ebuild
deleted file mode 100644
index b11b8e9f8900..000000000000
--- a/app-admin/awscli/awscli-1.29.42.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.43.ebuild b/app-admin/awscli/awscli-1.29.43.ebuild
deleted file mode 100644
index b11b8e9f8900..000000000000
--- a/app-admin/awscli/awscli-1.29.43.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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 -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.44.ebuild b/app-admin/awscli/awscli-1.29.44.ebuild
deleted file mode 100644
index 401bb2515e83..000000000000
--- a/app-admin/awscli/awscli-1.29.44.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.45.ebuild b/app-admin/awscli/awscli-1.29.45.ebuild
deleted file mode 100644
index 401bb2515e83..000000000000
--- a/app-admin/awscli/awscli-1.29.45.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.46.ebuild b/app-admin/awscli/awscli-1.29.46.ebuild
deleted file mode 100644
index 401bb2515e83..000000000000
--- a/app-admin/awscli/awscli-1.29.46.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.47.ebuild b/app-admin/awscli/awscli-1.29.47.ebuild
deleted file mode 100644
index 401bb2515e83..000000000000
--- a/app-admin/awscli/awscli-1.29.47.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.48.ebuild b/app-admin/awscli/awscli-1.29.48.ebuild
deleted file mode 100644
index 401bb2515e83..000000000000
--- a/app-admin/awscli/awscli-1.29.48.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.49.ebuild b/app-admin/awscli/awscli-1.29.49.ebuild
index 040a8d7bd9f3..630c1d8c7f2a 100644
--- a/app-admin/awscli/awscli-1.29.49.ebuild
+++ b/app-admin/awscli/awscli-1.29.49.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.29.50.ebuild b/app-admin/awscli/awscli-1.29.50.ebuild
deleted file mode 100644
index 040a8d7bd9f3..000000000000
--- a/app-admin/awscli/awscli-1.29.50.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.51.ebuild b/app-admin/awscli/awscli-1.29.51.ebuild
deleted file mode 100644
index 040a8d7bd9f3..000000000000
--- a/app-admin/awscli/awscli-1.29.51.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/awscli/awscli-1.29.52.ebuild b/app-admin/awscli/awscli-1.29.52.ebuild
deleted file mode 100644
index 040a8d7bd9f3..000000000000
--- a/app-admin/awscli/awscli-1.29.52.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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=(
-		# broken xdist (signal() works only in main thread)
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
-		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
-		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
-		tests/unit/test_help.py::TestHelpPager::test_can_handle_ctrl_c
-		tests/unit/test_help.py::TestHelpPager::test_can_render_contents
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -p xdist -n "$(makeopts_jobs)"
-}
-
-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/emacs-updater/Manifest b/app-admin/emacs-updater/Manifest
index bf6f53b3be09..5f627876707f 100644
--- a/app-admin/emacs-updater/Manifest
+++ b/app-admin/emacs-updater/Manifest
@@ -1,3 +1,5 @@
 DIST emacs-updater-1.16.tar.xz 7112 BLAKE2B 82160ef71b4c22a385a45765c1f60b7d428297cfb3b51f84bd44b176d1bd302165f9ccdde803aae628a2dab9e0520098082232c513b2006ae5facfa283f287ab SHA512 3de3126debc49ea47bd57802c1a3aa82a0769ab392741fb891c93ffb66141f05f58025fa0de746ec78795fc34c135536740e447e1f6a4ae59aa847d21bd6215b
+DIST emacs-updater-1.17.tar.xz 7236 BLAKE2B f39a19eba794cd57b25fbfc38998775a7818d98c81bbbdf485b33ed273815dfb3a74c26ca410f0e3b8e4bd46f2114b96155485cdcf87d5bec70a96dfe1a3a279 SHA512 461f496075bd7fc057290d40d408e5243ec464d8814abbe0c47c77a223b314ba2bcc35e20bf5e22e6dcee485a024ab93ced7155fa5212bc2d9c3b6362f168c52
 EBUILD emacs-updater-1.16.ebuild 942 BLAKE2B d218e07f7b972a4108c9f7c7f94338c9aa73a7df1c31740c8c47cce57513c59798d7c6c71e44392f62f3e348cd886cb8dd47b79ee9855bd5eafcb8ba85a2b31e SHA512 fcb5b52ce0f7c78ad58b54f4e3e724b4fd7204af4034ef521ee311a6624951510dae93984a2b132c30817a920f15f4b904490cb2ef70f34d1b3714a3f79c7816
+EBUILD emacs-updater-1.17.ebuild 949 BLAKE2B b2ec49bdf2ac5341c43f8b44f9a84175debdf9732365718e5b18f62256c52fed590b3ae2981ebd09e10006ee3f60f92b0b95f82fb4b902bb37d800103de04d08 SHA512 0f6fd6f32aa65d4e4bc630a5731215354be19b139d54953b1e4e99d857b8557577712e5189262da596956ac8034972cdde2be425e628d3b1c9ec3a0281fe9f58
 MISC metadata.xml 362 BLAKE2B 59c9e3025bdd347e4812d6485bda2b731a1b0adf2eec16aefdd6b0d3379a949cd99c637febfcab0c6314c457eafe0727a986196e4499aa29dbd297a6a0458d66 SHA512 5882c9372b62c44189426a1ea3ac975e29b70fc5b5d30a3f024edced82d9406e118e9acee91b1353c76eb65f19008e4bb1475f859509c933be48c03aa701394b
diff --git a/app-admin/emacs-updater/emacs-updater-1.17.ebuild b/app-admin/emacs-updater/emacs-updater-1.17.ebuild
new file mode 100644
index 000000000000..81cb320756a5
--- /dev/null
+++ b/app-admin/emacs-updater/emacs-updater-1.17.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Rebuild Emacs packages"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND="|| ( sys-apps/util-linux app-misc/getopt )"
+RDEPEND="${DEPEND}
+	>=app-editors/emacs-23.1:*
+	>=app-portage/portage-utils-0.80"
+
+src_prepare() {
+	default
+
+	if ! has_version sys-apps/util-linux; then
+		# BSD ships a dumb getopt(1), so use getopt-long instead
+		sed -i -e '/^GETOPT=/s/getopt/&-long/' emacs-updater || die
+	fi
+
+	if [[ -n ${EPREFIX} ]]; then
+		sed -i -e "1s:/:${EPREFIX}/:" \
+			-e "s:^\([[:upper:]]*=\)/:\1${EPREFIX}/:" \
+			emacs-updater || die
+	fi
+}
+
+src_install() {
+	dosbin emacs-updater
+	doman emacs-updater.8
+}