gentoo auto-resync : 13:10:2024 - 04:04:06

18 files changed, 10 insertions, 747 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ec0f5bc1b491..ec14e0e8b741 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-core/Manifest b/app-admin/ansible-core/Manifest
index b10ba8c08b80..0b406c59eb8e 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -6,6 +6,6 @@ DIST ansible_core-2.17.2.tar.gz 3125313 BLAKE2B 383e3bba117831053c8147c9aca15ee6
 EBUILD ansible-core-2.14.13-r1.ebuild 1350 BLAKE2B ce7e45f5a2c34e03bac3caa1b0496b3980b0861ecc3168c3c8d16d4c08370e2e5689c6c1a2d70b06cc47584b081b62291d7aaac42f5c4e5b9a2048fe4906061c SHA512 299eba1b7560ff846787004890998f068468d5497e4873afa6c3ad183e41df275c72f20d2a3c25d5438cd1ddd73e18dc73b94a617bad276e929ae41897422946
 EBUILD ansible-core-2.15.8-r1.ebuild 1305 BLAKE2B 8af6dc3e871bc702780081015d9bf13ebc4cb71ee245699d4500fbd198c7f902ac992854984d0f089d7229c67dac9a38bed5868f31384dff3a69c1ab86878ccb SHA512 075ab031f9097f31a4954a7b5f849540e59424c6b574ad8e00be29773853a58c24fd27992273c56ffa00534d224e8b8d2bde5cffd20831aca02cf27015c9f4b7
 EBUILD ansible-core-2.16.6.ebuild 1285 BLAKE2B 628ab53b31fe1c63cc1bf1a9e2439d80458a070152e72cbac24da4edb99fdc8be7a75ae75c65a5d72f353763edb1d04cfdcf702218924333c5a8cb0243169c77 SHA512 561b953b0eacdfd98c1782e3bfe09196715380ce94071be4075bc534bc111f66ec73b4b4cf58aa012376dc8803e8556f5950b04db8ac5489e37ef42e0571c538
-EBUILD ansible-core-2.17.2.ebuild 1288 BLAKE2B f4856eb1aa092023edf3b562ecad65a738f8a36800978b7aa97f9e5e7336ea05f308705a5f60b04881a9ac3690b8079f3b9e178fdbb363efd20f3ed4e81b0500 SHA512 3fe80647d31d0528dd7b646958b8fc672f5e1594eeeebd3bd9afa0f61a6c1a16cd84b7fddbc5a771cc64e92c9d747c7619b57d7ed1c165763aaf7d6ac6f3b74d
+EBUILD ansible-core-2.17.2.ebuild 1285 BLAKE2B f696142fc1f3c8475c7acf0396d15d5eabf9dd05a04e96d719e6ebbf44b080415a9ef47f0417983a465951dc25a93b66804feb8757eb34998f707b573bd1b5da SHA512 fd70b2f179404c9bcb8d15e4a9cdd346e85ca213c412043dc9fcc32cb8794d1709a9abb23ede09ffe020bb91f144a09f2d174c23b5888bb5b53162626ba67e1a
 EBUILD ansible-core-9999.ebuild 1288 BLAKE2B f4856eb1aa092023edf3b562ecad65a738f8a36800978b7aa97f9e5e7336ea05f308705a5f60b04881a9ac3690b8079f3b9e178fdbb363efd20f3ed4e81b0500 SHA512 3fe80647d31d0528dd7b646958b8fc672f5e1594eeeebd3bd9afa0f61a6c1a16cd84b7fddbc5a771cc64e92c9d747c7619b57d7ed1c165763aaf7d6ac6f3b74d
 MISC metadata.xml 924 BLAKE2B 7dcd1be7a7eea2a5a762ec295d2d285242f9350d377abb1d633c6eb7cdd1eb8f59b02a6908924f424c0b5f42b2f6b3a153523439cc10caef51656c9f75bcd87c SHA512 a6fbf2ee3743ad9d54864c8d22b75cd506f17e1abd6963b3499de55675fed711abf4df6b9fe2589d8ea0b2f93311d06cfbcca7b99469107d708d2bee5cea0694
diff --git a/app-admin/ansible-core/ansible-core-2.17.2.ebuild b/app-admin/ansible-core/ansible-core-2.17.2.ebuild
index 786e98e24c1d..a8d027838212 100644
--- a/app-admin/ansible-core/ansible-core-2.17.2.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.17.2.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="devel"
 else
 	inherit pypi
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
 LICENSE="GPL-3"
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index a3e5b5ffca24..1fa7d7aec5fe 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -2,7 +2,7 @@ DIST ansible-10.2.0.tar.gz 39352378 BLAKE2B 46af9df464462ee906a4eef114da480c7bf0
 DIST ansible-7.7.0.tar.gz 40709642 BLAKE2B ee2f8d124f79ca3a3f131bfbc4f93e10d104a38262b7d60edd2a88284275fecdd3acf0e566a5cc81a1fb6a179a0b7c51215f2945d669be4c6af7aa2a4f31ade0 SHA512 7da6845c9a68f2b8c10cf3e4cc6ea347861d5b59daa6ac895731ac79b733c6724d234345054fe9e3bf4ea460345b9026492fda42dce22bfbc027c9b4de093fd9
 DIST ansible-8.7.0.tar.gz 49317896 BLAKE2B d5923753e368e908a569c5f8f261b1afe7c51d5381db190bf7de1e81f0a6359136581852faa2974f174e816944c66e2c0f625d3d62bdde324758309982c90de9 SHA512 6a67f8553c3fa56559e4a31ec627cfe2c5f42e147d94bea305ec4580af9ba8add136092b209a5a3d7f9022407e9d557484f044d23cb227973fe4e4341fed7983
 DIST ansible-9.4.0.tar.gz 38389836 BLAKE2B a2e08088565e6f248c1185ee96ac2365fc1385993d3f3fe68f941e8acb0e567c3defeec3ea376a30213921f02881bce0a0ac737323fc3ec82dc77d2d4a550dbd SHA512 4c75235a866f3f95cda8dd3b6c9d22b916ad117d54a86a30585f71c9015cd98db764afa225af5b2f6fa884af558ee488785e26c9e8b9e8be105062f069f065b2
-EBUILD ansible-10.2.0.ebuild 691 BLAKE2B 08e50571ca4b99cc8382aca83dbb39c9c374531abaef4d1fb2c41078b1a38c3153a466ed3581e3a1bf2825df6b22173a09b17408638cfa0fa731ba65c3289b41 SHA512 971d38a2fd8c35ba62af36c977803f6a3dc2c4ff8406376fdba93be8ddaed4fe53ce47bfe37ce4c62fcfa5114cefbd2a002416a7fb7e6be7a18f1bc3534c685d
+EBUILD ansible-10.2.0.ebuild 688 BLAKE2B 349c33e72eda578ca8ce6579e59f350f5169e77a642f539bba6c2088f4475ea37a280fde903313043089ffeb480d0d217ba090ec5944e6233ad05d90d1844957 SHA512 f74d3b95d631632accf781f5c6044625d5c9464877229f956a5955278185aae03ecce3a554d75cfec22f3ea99503905f222706638f3c399baf60e958ded8a01c
 EBUILD ansible-7.7.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 EBUILD ansible-8.7.0.ebuild 655 BLAKE2B 74f7871faa2bfe26fa6e09ce2b5ac89121c3b608e08e0a9ec9bf5987a8460ca1102a1cf24293a5f58307d94fca6bed53670754183d4fb2ac09a2ab7541345e2a SHA512 4e1b54c8e83abd8ce1540e48c77ec6798fe0297c9e23f040551d7f5e5d17b9092fc22a0c8970e270198f1054558295c77467d95bc8844ee8e5a61f9eff8331fc
 EBUILD ansible-9.4.0.ebuild 688 BLAKE2B d8bb8932a776dc3592f7b2d89c99a51e0cf3e1d299f15bda17a23140b77024c18cf5a379fbeb7e1ae2e481136d23a568a7582d6f50080baa4fe3b0d6c507e3c2 SHA512 8c6275fdfbe43c6ec137b5f9945616621950a3e191b05068ab1af9fc7ede679c0e49bdfbfc1a0da23e92b7f2c0d7ace0d06896a9491a44fb2eac8687179206c8
diff --git a/app-admin/ansible/ansible-10.2.0.ebuild b/app-admin/ansible/ansible-10.2.0.ebuild
index 04e06e19e569..d903f1f597c3 100644
--- a/app-admin/ansible/ansible-10.2.0.ebuild
+++ b/app-admin/ansible/ansible-10.2.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.ansible.com/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
 RDEPEND=">=app-admin/ansible-core-2.17.0
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index f3eda619867c..352b1fe2065a 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,23 +1,7 @@
-DIST aws-cli-1.34.19.gh.tar.gz 2795240 BLAKE2B ede95bb83dffdef1cbc6896f35e6926e3f7fe1cf27a091c019a4edadc57c24a88d06900fc6542fcf78c21f57de6651759a8ebd44952b21864313269c1cbfb289 SHA512 a82299d7f2d2fbb4600c91739b38e22e83eb95ffae0e70ef62e95ba039de6a47ba1d4e2423190a5e8ee59bf768a85181153c60329b9bbfc1a3e794d07d50dc75
-DIST aws-cli-1.34.24.gh.tar.gz 2798088 BLAKE2B 24d5b74da8e6e1b97cd8c3558d28581acbb48250caa0a33ad9635068a358b6a0e450446d1486783e4208bb067f00616cb4c708c1674bb43ac3f9b7630d4116d2 SHA512 cb1d9fcf322e68a69f732a95c39701d937e83ea91a73b93dc565a7bb575c0f79b6a3cf0f47253321b3e54d9c5824b054798f53f5f82f9a29f94758c3a19aa4f9
 DIST aws-cli-1.34.29.gh.tar.gz 2800945 BLAKE2B 93d9b41dfb2d80546f6cd601ff339053b6fef760bf9359d56b2d3835c1a8cca21146b492100db611c1bbe8601ad143dde0490b86d63eba7707141a5ca0c6aecb SHA512 9174fbc0e552d708916080b8b3d5b6b1e871332ac2a8b65b27091745b4537120d97c99ced878c861960f81b8368cb564a1fe573c9dc528c343b2100fc0ea6b08
-DIST aws-cli-1.34.31.gh.tar.gz 2802205 BLAKE2B dbdf6124a47756dc1ce93dafd3a3ceedfa8569a96e467cd2d5f44f42b642e5701e2bfb690000e01737ef126f554325998dd51b42007947848ce69512a0aafeb7 SHA512 4db1e625b1a64906b8c01371f594b32208e82c1d3eed59fb54aedddd147c64501b5d6f5d07c3483675a4bf81a0260be359b249f830fc084d7f04557760cd995c
-DIST aws-cli-1.34.32.gh.tar.gz 2803375 BLAKE2B 199015e283253e53a911883da0f2303a13292813f436931e94b36f4aaf34578596409c9781c5bdd536557ca85ac749d2b2ded843a01889bca7fe2f08981ca3ad SHA512 f0d5bcc696294e5fa99eea098ec2d5523f3b1e5ea04ab08bfa9c98bf519b639d374990c1f67099ce81be7e095aed468c3d84128cd35938ceaf8be1141859409a
-DIST aws-cli-1.34.33.gh.tar.gz 2804264 BLAKE2B a3c45f08ffa977d727c0a5c3e7c7d1391faff6ae47f138577fc87be72250f4e2d01b8b4a446c89499be16f5248d53fdef75491965c11504917d2ef2e629a96d2 SHA512 c5dd06e908081ae70ebbc2228d2a2760b115d22afc26d890a3020f4807c4a646921aca0445909942a644a69928b38b1056c886db2d31d61a8e98abbebe08bc52
 DIST aws-cli-1.35.0.gh.tar.gz 2806480 BLAKE2B d607933a9baa0e50ab8d809e0ecb68681e90815fca7db6b69b01a632a56d37a62bedaf6dc981bffaa0206b31b6ca84b3d5e3524289b9b2edc55ef1989239a696 SHA512 2008b00455755b3c332b83d6df3e86f461a94b401aeb022887feddd6f5f3ab439b382d24d46c4e0da825df24899ede6307c4e482987d07171d38704c85ac4eb1
-DIST aws-cli-1.35.1.gh.tar.gz 2806870 BLAKE2B 93728164035382e95bc3a181b2f36b1c6509abf7084efa8210518ddd1d5c38343b860eef5e69e0faf6119445060c9281a29c5e6c623b8ab5d25f5cefb85d989b SHA512 86ddb82f2d22e5c330a6cac58568eda63065f4b77621534040203866825e97df583d1d5637b7b12f8ffac68e9f42e79d2c0a1f3abb192c121a8fc8bf773fc5e5
-DIST aws-cli-1.35.2.gh.tar.gz 2807621 BLAKE2B edaa14c648871d2d769ba90305d6c545710ade9c4724cd698c32b9c83a0611808e6fbae1dc052da5656804314dcc34479cddfac770997e2123c6afcabe82cb64 SHA512 148a203860e03a630bfcd4a6f1bc39be70bc9180e06fc6f7380d1a7678365a4d94de89f138bec7430575bfd84ab490020d72a735796b41a91f2caf4164abeee8
-DIST aws-cli-1.35.3.gh.tar.gz 2807624 BLAKE2B 31e2be1970828517b20e6fafc3d4d2c759ff95c5cfee3ed4f1544d15e5f239559db84b5a5989e041cf075d2b237a973725126b3dd459733ffdce533d9162b30f SHA512 37379490fcb86a1973f040730b4b34b572a24be6f51c42476e10db9a83121da36eb4d0cf0e57015212a97471b9d2b9bd892dee654c2585c2d166ff4f7b74516c
-DIST aws-cli-1.35.4.gh.tar.gz 2808228 BLAKE2B 14156c4bd8fe25e192ce55f0d6e9349a9b21d5aa059453c4217481fe5c2f294950e20eaac9f6701ae1832f022642bf55da10477ad987cb1124e044c8d6705e46 SHA512 6073dc611eef727776e487d53693b7150160b3b1fb5e1e83ca37bcee3602c944affb7f378c627de5dc1da239510d3ed2a4b76d434bc0d70a0743f51550ffa9f1
-EBUILD awscli-1.34.19.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1
-EBUILD awscli-1.34.24.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.29.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.31.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.32.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
-EBUILD awscli-1.34.33.ebuild 3030 BLAKE2B caff93dffa12da6e0698e0c392d5c54288b22335b9ab6568d5c21cc9a894c952489cce772f5b34be10825a6066920e34c8766dfc4a4a96b2c801233049de7d82 SHA512 127fd2aef4d38ff566bc470dad93552291abd3ae7f1a3bc81f8ef5ef331eece6519d53c6c1e89fcddbdb3566ede964e502b752a7f7076baeb09eb3141f726ab0
+DIST aws-cli-1.35.5.gh.tar.gz 2808789 BLAKE2B 545c76bd349485fbf2dc5565317678904c99443e2e6dc2e12fa9de122327d8aa0e8b9579cec37afe2e949a0c31c48e0977e52d701ffc212182c692769c35a948 SHA512 2a9c86f1a63b657d3c95f8a65020ea7837ded9f5147ce31a535f59b9d9c1c91c3354a82286c25252da7d5b7c48c1898f594be0cb9e1ba54c6768133543fcba50
+EBUILD awscli-1.34.29.ebuild 3023 BLAKE2B d02d93dd9b37902da1a0555b84ef0fab8f1179c2983d783717f9e2f3cd55d72b07ed1164c263aec3706f6a69d1265ecf439ae95ff273c215416ba73a117ae0a6 SHA512 d9e7f35c8346a432ea2b6067908620b0cc6527fa21e5c8c5bfef2878fe656603a0cd8fbc7479e3ff4dbad655eb8d19622097409de3f80a55986104932103f1e1
 EBUILD awscli-1.35.0.ebuild 3032 BLAKE2B 9a661418bff83e0179259efa93dddefd5f743681f8f6858bf6121e5f97e7454396cb7471807faa8747e34e63ee6ff3aa26dbb98cd213bff9aff3ddaad91b1c77 SHA512 b283c5794d8a084464c6cff8d348d1352ec08a96735245bb77676b9572b523b3b462ff0304960d8c481df9a71380a236a44687c1a3fc3f69b1ea812618df05f4
-EBUILD awscli-1.35.1.ebuild 3032 BLAKE2B 9a661418bff83e0179259efa93dddefd5f743681f8f6858bf6121e5f97e7454396cb7471807faa8747e34e63ee6ff3aa26dbb98cd213bff9aff3ddaad91b1c77 SHA512 b283c5794d8a084464c6cff8d348d1352ec08a96735245bb77676b9572b523b3b462ff0304960d8c481df9a71380a236a44687c1a3fc3f69b1ea812618df05f4
-EBUILD awscli-1.35.2.ebuild 3032 BLAKE2B 9a661418bff83e0179259efa93dddefd5f743681f8f6858bf6121e5f97e7454396cb7471807faa8747e34e63ee6ff3aa26dbb98cd213bff9aff3ddaad91b1c77 SHA512 b283c5794d8a084464c6cff8d348d1352ec08a96735245bb77676b9572b523b3b462ff0304960d8c481df9a71380a236a44687c1a3fc3f69b1ea812618df05f4
-EBUILD awscli-1.35.3.ebuild 3141 BLAKE2B 5c14d1ada2a8692c95bc6975412782283583a98ea26a5ae45940f7451aabac59b5cbe4f384fdcf1ebf8bf0face6924215f7b0c1c40c1c2dcb8efa1c043b40a05 SHA512 14a538a63dc521fb224d0f2c2e5e24093fa1195266bb6e00780b2e9268d319eba20db9db6c9327bde131b756076de9f673865d4f49954b7779a5df360a995c34
-EBUILD awscli-1.35.4.ebuild 3141 BLAKE2B 5c14d1ada2a8692c95bc6975412782283583a98ea26a5ae45940f7451aabac59b5cbe4f384fdcf1ebf8bf0face6924215f7b0c1c40c1c2dcb8efa1c043b40a05 SHA512 14a538a63dc521fb224d0f2c2e5e24093fa1195266bb6e00780b2e9268d319eba20db9db6c9327bde131b756076de9f673865d4f49954b7779a5df360a995c34
+EBUILD awscli-1.35.5.ebuild 3141 BLAKE2B 5c14d1ada2a8692c95bc6975412782283583a98ea26a5ae45940f7451aabac59b5cbe4f384fdcf1ebf8bf0face6924215f7b0c1c40c1c2dcb8efa1c043b40a05 SHA512 14a538a63dc521fb224d0f2c2e5e24093fa1195266bb6e00780b2e9268d319eba20db9db6c9327bde131b756076de9f673865d4f49954b7779a5df360a995c34
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.34.19.ebuild b/app-admin/awscli/awscli-1.34.19.ebuild
deleted file mode 100644
index 96357b5055a1..000000000000
--- a/app-admin/awscli/awscli-1.34.19.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.34.24.ebuild b/app-admin/awscli/awscli-1.34.24.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.24.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.34.29.ebuild b/app-admin/awscli/awscli-1.34.29.ebuild
index 599b9bd389b9..96357b5055a1 100644
--- a/app-admin/awscli/awscli-1.34.29.ebuild
+++ b/app-admin/awscli/awscli-1.34.29.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+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.34.31.ebuild b/app-admin/awscli/awscli-1.34.31.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.31.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.34.32.ebuild b/app-admin/awscli/awscli-1.34.32.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.32.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.34.33.ebuild b/app-admin/awscli/awscli-1.34.33.ebuild
deleted file mode 100644
index 599b9bd389b9..000000000000
--- a/app-admin/awscli/awscli-1.34.33.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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+1).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1 )).$(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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.1.ebuild b/app-admin/awscli/awscli-1.35.1.ebuild
deleted file mode 100644
index e80a7e281fcd..000000000000
--- a/app-admin/awscli/awscli-1.35.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.(z+34)
-BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.2.ebuild b/app-admin/awscli/awscli-1.35.2.ebuild
deleted file mode 100644
index e80a7e281fcd..000000000000
--- a/app-admin/awscli/awscli-1.35.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.(z+34)
-BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.4.ebuild b/app-admin/awscli/awscli-1.35.4.ebuild
deleted file mode 100644
index 49e2e891cd54..000000000000
--- a/app-admin/awscli/awscli-1.35.4.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} )
-
-inherit bash-completion-r1 distutils-r1
-
-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.(z+34)
-BOTOCORE_PV="$(ver_cut 1).$(ver_cut 2).$(( $(ver_cut 3-) + 34 ))"
-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.10.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_XDIST=1
-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 serial_tests=(
-		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
-		tests/functional/s3/test_cp_command.py::TestCPCommand::test_multipart_upload_with_checksum_algorithm_crc32
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
-		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_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/customizations/test_sessionmanager.py
-		tests/unit/test_compat.py::TestIgnoreUserSignals
-		tests/unit/test_help.py
-		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
-	)
-	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
-	EPYTEST_XDIST= epytest "${serial_tests[@]}"
-
-	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit}
-}
-
-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.35.3.ebuild b/app-admin/awscli/awscli-1.35.5.ebuild
index 49e2e891cd54..49e2e891cd54 100644
--- a/app-admin/awscli/awscli-1.35.3.ebuild
+++ b/app-admin/awscli/awscli-1.35.5.ebuild
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 7b9dd99ff727..3829d84ae450 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,5 +1,5 @@
 DIST conky-1.19.8.tar.gz 1711683 BLAKE2B f1c1057f07570e63026e51a03fc4d7a51cc1dcaefb963b5f9ce9fba4e71342770bc1a59aa9a834fe8f9d6d552e7775ab0e2d5a487d9b6ec2d215768349c4994c SHA512 bdc5b29bea3a3050f4fe4ce76fc642134d93a91362e491203dc10cdde1d9c1bde8a106cd8388aab1893e4b1def058abf1f35c1fd022c26ac773071ddd44abbc4
 DIST conky-1.21.7.tar.gz 1961997 BLAKE2B 80ca17e0d1065655c410d8108668b3f09df574b761d57e374a2d51c946b51bd1ce4d29d320def0a197d465401cb4a665fb84a394406611903877c0acf42b4ad3 SHA512 52b6621e3e693654610ebd1b9e1adbeaec2ae2a2aaed4b038882a6825e6573f4afdea85f9156e1ffaa5999e30b3b05170b6b101f415980f0edab5c85151e9e6c
 EBUILD conky-1.19.8.ebuild 5805 BLAKE2B c56ad10b94d3fee046a955a7a25d7d1ed71d089c2a935af6260d3c64e3181a8db74b5fbb0a27983a542896816a1150a33bb74797c3a87842efc829b26603ff1f SHA512 8f8cafd306f8ac7deb5d63c924f7eddcb2a76582ece7a7d83355422ecbaf09e57cc214241445fe79d84b4da96f04d9344f05cce192f451a9bb732e64c5575efa
-EBUILD conky-1.21.7.ebuild 6189 BLAKE2B 7760f357b8314abc59a11f4609a907158d42fad857be832d8e5c78eb53cb230a7e13fec808842b49bf9fa0d3e7c488b4a3791522c80355b5012ae4b39b6b0bcc SHA512 62214b52a2a1a34b09def693363d9d3c2bd3c2ea004527a952cf548f6a50382e9cc9bb98efe4a00f52229ffdc4705a732dff432997f4544db7a7d8695fad8dc1
+EBUILD conky-1.21.7.ebuild 6188 BLAKE2B 53034ca42cbbebe3a92cb077d9457bc9e2e43edfa7c818b694724fbcff18c539027cc9e947e45b9c428ecb260923ed398f71749a511cf925d6dd638ff97363a0 SHA512 c50ade527bdb7d3597cd05ade103d56f72a4233573f8b4a5e3752142594b2e966cb3966fa61c4ed9662cfb4358953a267280978541469cf20d5129f9eb8537c0
 MISC metadata.xml 2706 BLAKE2B ccd856ef7d804a1d4cea72124dc575dc3b94b6cad0b98b4bff8248f70f84b1705d862a58b0c98d1a67ea17c412e7d967a32d31678e8b51d5234c215d54389a57 SHA512 65bd968350ff45ed491a2cc36bb7d5640e38f3a4b4a0e0e3fe22d4e74563c2bf2a3d9f3cd9f3c67a0e9f8b756c387f72fcf8581c6876941112470f7f04e47ddf
diff --git a/app-admin/conky/conky-1.21.7.ebuild b/app-admin/conky/conky-1.21.7.ebuild
index 2a2b1bd1e909..0a5b2f91faab 100644
--- a/app-admin/conky/conky-1.21.7.ebuild
+++ b/app-admin/conky/conky-1.21.7.ebuild
@@ -14,7 +14,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 colour-name-map curl doc extras hddtemp ical
 	iconv imlib intel-backlight iostats irc lua-cairo lua-cairo-xlib
 	lua-imlib lua-rsvg math moc mouse-events mpd mysql ncurses nvidia