gentoo auto-resync : 20:05:2023 - 10:17:50

21 files changed, 237 insertions, 778 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 651b0700d1e1..2f961e4114e1 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 babd27c7539d..f68138c6a8e9 100644
--- a/app-admin/ansible-core/Manifest
+++ b/app-admin/ansible-core/Manifest
@@ -3,7 +3,7 @@ DIST ansible-core-2.13.9.tar.gz 14025835 BLAKE2B 831f04f1d4872d2e7a9801e69e450ed
 DIST ansible-core-2.14.4.tar.gz 11589961 BLAKE2B ae096debaf676dbd46cb047f0f87af5d09b4265368500964bbd0cf3ac8e58969bee489d66486fb570a697df5b22065fae206f1df361eb911a7fe025628655371 SHA512 86164dfded15232174e4f11140a71b91ef5b0d93b40a2df9588930b4b955f20feb419258c2bbf9d6735d298ec626c88c5e9b1c933a51e3273a28b85fac7a3762
 DIST ansible-core-2.14.5.tar.gz 11620295 BLAKE2B d006f773e1c2b28582143a4f08f699e5744fba492130388fa5463053cdf8f0cc7056296daa213c72884ea0c0ba454a3e04ef118c184faba8c8d3c281ae65345a SHA512 130a0de925c7229dee350ddbf4382d87802d86aab4817ed595105db8ed5071153847dac0478f20a994670e59e53a07b77d0bf35855d309ebc222fbb61233b7db
 DIST ansible-core-2.15.0.tar.gz 10801327 BLAKE2B 58d92d3d8cbc87d9c2c606317bae3b6841c66b9600153b38be912b02dbc19069ff8e755daa574e394ac5d12c04859640f0e2af17ed0adeb8a12da76979c163d3 SHA512 aebb43840380854e7759656a0b08579a8fbdddbf2d204c47fb16cdb73ffd540df5ad56e5bf4a78a338804a3d40f9b042ea50b2b1853aaef6b7c2f0aab7a95432
-EBUILD ansible-core-2.13.9.ebuild 1325 BLAKE2B ca6bdb1f2b9eb14c94a4e443f02751f41e1ddf9eaec7e46ed91ebfb2fc9a77ed3d4d9bfef2bc9fd92e9ec6fe707a4854ddb0fdfd457d8859a5dd48da4783313e SHA512 380e6c95b884d493f0de5a6a721a2fbe02bc5ac99b9de8e8a2b7be901c9510b5d7f9f876352a2ff0fe553da03d50d5e55275135a899cc3f7a8e88e1bd8db714c
+EBUILD ansible-core-2.13.9.ebuild 1306 BLAKE2B 6305f4d4d83b581a94f7bb9e8501e541327c489215eeb2db26dd99086d25b8109a4cba21f982c67f04e978b7fd39d46a0ddb922ec503e60d6ff967ee1fcb9a18 SHA512 96b4ed14b611917f26c5eef7a618c9b6aeb3d84eda44f3292bdc448d50259a4c8618137ab655f326f49824695e0fb8e057109e68b5129c89e1d05df75e868958
 EBUILD ansible-core-2.14.4-r1.ebuild 1351 BLAKE2B b00902f00b8f1371777e41651460ecd2925d20a165ee8e491ff7e4d7cd902d380eed501556bc8c393e2236f79818eeffff05f8e2f093408ca61cee70d0ee8642 SHA512 94e9821734f241f745301bea4676c7d7aee48628d61b910cd694d6d541a660fe226bf9e5b50129b5263221ef9986898f656831a63531ada6916ba63d4b620724
 EBUILD ansible-core-2.14.5.ebuild 1354 BLAKE2B b338058c316d4c5ba00e2af886f80b0d30e2d35b21e7c761a9ae4c07a0a538f04980c19de72eb19f8a3267482c3c6a50b8a3bdaaca42c101e84cae71439f53d7 SHA512 fb2b58338c253cde83c375882cc648a8dc7930408f3e235b146144b067ce754f2bbfcb8e1de8429e13d2eb693fa68f7bac89cbe1861c10424d26057ebd020936
 EBUILD ansible-core-2.15.0.ebuild 1309 BLAKE2B 5288758a95f5be33854ed6093801b954adbd067213b825eefb2ac56945f15cef99aae4d82e87de8af26b48068b0a98f424a12861efff111c2007e2f1f1d61420 SHA512 c9c81036d86440c692ccf304c229caa8929d1e34519831d62b627141192d33cf832462b3ef2fbe65ac8351f4b56cd3b3f898e0c829b45b5440a0753a88f0fc1e
diff --git a/app-admin/ansible-core/ansible-core-2.13.9.ebuild b/app-admin/ansible-core/ansible-core-2.13.9.ebuild
index ee8d323e90b5..3c7933de840a 100644
--- a/app-admin/ansible-core/ansible-core-2.13.9.ebuild
+++ b/app-admin/ansible-core/ansible-core-2.13.9.ebuild
@@ -5,6 +5,7 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
+PYPI_NO_NORMALIZE=1
 
 inherit distutils-r1
 
@@ -16,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
 	EGIT_BRANCH="devel"
 else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	inherit pypi
 	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 fi
 
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 1a786f3560f1..ed5c5105b4fa 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,7 +1,7 @@
 DIST ansible-6.7.0.tar.gz 36371372 BLAKE2B 75cb14f158c36ded8313a1c5b798838afdf3a38ffc8e29a87c8e1e3e74c9aeca827432397ad83ed23a1d3aeaaef91822cc3c23aa226a307d93f84f54b25d71bb SHA512 676baf03626d5bf36aea7117d39ef71ba7878ab6bccdec1ee199bd699d559a5f3f6a0d9032ef120204093677b7fbbe1b575529d3aa692acd1a4447f9c2715f3a
 DIST ansible-7.4.0.tar.gz 37352820 BLAKE2B 33d3affa052e509348c981920597ab13f3181dee1ab46eda764e0a68df2edeefbcb62cec57e62da559bfe2b5e7efdb95eba1b602efe198bfad8dd0301e66c7df SHA512 c77aebb54676b669305905c969fa5afac9e1262bfefa358de7fee0fb3ef89d0306c599acb2225cdb4209c53df16c307d438cc628299aec494c70cba166eb3cbb
 DIST ansible-7.5.0.tar.gz 37716844 BLAKE2B 47f6fcb744a65b3dd4d8619acd0ca23561bb6f1e3eb12d038e212a0bd92e98e0c93ab5f08c463cca357c568cccb19eb1bfd764d91cf83d79564039525ee90bc7 SHA512 0246d5beabbe26733978d83359b5647727c833ca0dd3f84f86f61f906e62e96178bffb82e39a2a48ffc442e01f3ab8335f5bb7c4649c872373831ad2deaf9572
-EBUILD ansible-6.7.0.ebuild 702 BLAKE2B dc001693f809edd51a506b788ee1f3755d7cef610a8755c50d47f56ab9733a4ac65ccf3239d79d3a79cf4ff80e0f8ecef4e99c8e5528f6f4ad155768a0e0d303 SHA512 d0c71d92fdfdc1f588d045fab3a19971d994071bbdcba6038d72b3225833180a16ff7477367cee73011169a91f50788879ddd5dd0342a3a34e40fc51feeb74b5
+EBUILD ansible-6.7.0.ebuild 655 BLAKE2B b520b68ef90864d554ab8ee9c27447dd14da387130b32bc5d170a158c984aa5ea6f1023f298ebda3a0b751ece2ba7e2c7eebf688cc5c170216ad0e71af8fc960 SHA512 f4544642074e6c7d3d9753ef7a1a1f64f0f00934fd66b014068894f8bc6105cbfa6e43f2eb69c0a80745b17a6ed7504bcb8e2a941f4384859028bf17468b0254
 EBUILD ansible-7.4.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 EBUILD ansible-7.5.0.ebuild 655 BLAKE2B 737b7e75834d55ee6bbbdc00797896cfed122cfba478bf076156befa70e873899a3b4313408030aaa3214175e7a45bf3c86c21b4e84c2de5940c42cb5e68780d SHA512 4765ba667b64e4eb5659423a8ccc1eb8e52bd6c0f4e287b4aa4f79877d11ef88b95bca3518413f93cea3b785c27f739754af64781f783fa7e46cb2d44c1d7b57
 MISC metadata.xml 731 BLAKE2B 26c756a1f3d67f68ba824b56b8a7a48f13e6586c761da02d61852c7669c419ecab686ed1bb59ac7e229038413fdf9c0521b11d005e8250b63380c1b5282586d2 SHA512 e6d8bf5b9748c6aaccae0fdeb3f187be80d5a956dbc57578f6fa344a667624a0a4ffbaba689d2f7bc812dd91fb3b959b3293260729ce7c995a20fe47b2cdf097
diff --git a/app-admin/ansible/ansible-6.7.0.ebuild b/app-admin/ansible/ansible-6.7.0.ebuild
index e86ed09f9862..03564f86b834 100644
--- a/app-admin/ansible/ansible-6.7.0.ebuild
+++ b/app-admin/ansible/ansible-6.7.0.ebuild
@@ -5,11 +5,10 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Model-driven deployment, config management, and command execution framework"
 HOMEPAGE="https://www.ansible.com/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index db28daa19bac..8781d6471121 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,23 +1,7 @@
-DIST aws-cli-1.27.123.gh.tar.gz 2414392 BLAKE2B 4df3e98062e61931efc59168eb6dbe6b50f2bd50ef6d5d810bf2d98f08058f69c8965726662f90e8289e94408e916e700acc2d62512d3b3033210eb615bbb8c4 SHA512 bfe6fe1a2fd9209090957faef600b40acd7c4bbf9304089a2844ac736d782a0c53687dd1073faf9e05c8e23c6dd1b6d7930e009dc0ea7765000489130d2a5410
-DIST aws-cli-1.27.126.gh.tar.gz 2415804 BLAKE2B f6c9c76320ce2bd7c03009d01e569a4552c329148323d4d7d302b3f4c9dce7f8e6743f427f9308c155917abcf228c5b35eeb15fd06b6602ca26f5f7c34e0cbd6 SHA512 6dd52530d9f35bfcbcc3b4a20b9a45881eea79a274b6fd9a3b2b2a5d6d337dbd3bf9efbe931417f43a7705b0f6359783a0fcf16dc025006cb853fe4fbc297630
-DIST aws-cli-1.27.127.gh.tar.gz 2416842 BLAKE2B 6d1917695f9404a0edf1e9d1720606478e904615e46c775a5b65bab207a1b0ebfd1741daa2202e4567c0d4aa0d0eb6bfaf89210a6ccce542c7ee2c556c21c3b3 SHA512 32ac6f8e00434047acf46cd0dad80618e7c1926fa02cdc365005eccb3744f8ea2d67e11c7155a0ce88e6388668ec3aa0cd0bad33df8a7540bfd0cc1c9dcd52af
 DIST aws-cli-1.27.129.gh.tar.gz 2417079 BLAKE2B d1de37906ba0e541ef968aac5d7a7718167b6b8683d655f9b7ec91ab1e5ed289bff46dbb56c1a6a5c4e0ce56eb4fd9ebeac386d0ec38e855bfbd3076bcac2aa9 SHA512 cd3f57c1734d73964d712a7a5d03c83d3168f2197011b014a04088fb05090948463d95c7d9321e1ae1e21992e18013fdd260b640f342681bca70f2e33e423f88
-DIST aws-cli-1.27.130.gh.tar.gz 2418752 BLAKE2B 5c8ad7c3af4312d2ed37fb36270efd4a5fee676ea956cfb33a90e4714226b3a2e7e8abc3de5d1ce8eb159b94f37bf796a38cf276c1eb66e0ebc061cac04dc682 SHA512 2b76d803a646d73d0b63a9c42404c00b98b95b98cf2bc4bba714441b065bbbc41d81a3859a362451512c0936caadae9a06790c56b886e235804a4c962aced622
-DIST aws-cli-1.27.131.gh.tar.gz 2420246 BLAKE2B 3590493c0707ec80a74acca1a7c103eaa34e81c27cefbdc6b577eed044e553d35f0c727bfda163cf9c8344ab6550758fe69611acdada524d30f96f49fb330eba SHA512 4fb706f1a606c53a940c7c9d9c67cbfc8d9352a6c9d0c2c9dfa0bf9f46e75f1b102a32c38250a31aa3fd29956a099f69a5c2dc0e93777b5f3301e1fca1143174
-DIST aws-cli-1.27.132.gh.tar.gz 2420336 BLAKE2B 585b35e4e07933e7fcb1b1c93924bbf28340480b2391b2abc4cd32ed3db1843b1c9846937b9c96cbb05f382ae628f88ef89c136f6146781a1032a35932e853f6 SHA512 6fe1bb73444c39fcbc60d214696c021628dfe29a8692fe8460cb8f7d97522c39e9e0c998e1e4f92b6a7b0d77b47095621cc1ef38b6000e8c3db122ee79ec526b
 DIST aws-cli-1.27.133.gh.tar.gz 2421348 BLAKE2B 0511291bf018bb62616f11231327b47abd153533c8ef0cdd5414d1c6f7f96ca529e3bbc3e5bb73cdb59d010502ebd122c3e83dc63bb7b4d84a6f7b011d3a03bc SHA512 a308d805091ecc054e86bd83ca5525d5332f5f6efd2654ce1242e70c7459de75d4175689381cfcb530cb7b2b43d852fb827d54ef2845cb95206ef2379f8e3dc6
-DIST aws-cli-1.27.134.gh.tar.gz 2421575 BLAKE2B 7fee144f529720aa2bc2799bb617df5faa6262df3568c3c4021bcf5d6d2e3786420d6285b2f81fbb9ab9facac65c860a39ab09ff995ecb5c9bb7701b17c7e57f SHA512 f3aa56d46cc74050495320e7743680993e9530fd19ca0d6563b01c6379151e383c3a441f47f3fd3038837a4ecba54c2dc48f764545726d72304fb4e6a3208b96
-DIST aws-cli-1.27.135.gh.tar.gz 2421852 BLAKE2B f6c684a68e9bbc37c0e5722926713e74f9d259b758d3a0e994280eb2f2fd9ea4dc78915ce88628db4df1121f819c96c1f142b2b1cbf2c0f706b9803a97741725 SHA512 633e431fcd93c6768854eb36b694cfc32499bee58e71830890eed3f06947fb00e075bfc0fa2fe0ad77bb4bdbd6018a45ed6fb810176fc07705110f8a72defb3b
-DIST aws-cli-1.27.136.gh.tar.gz 2422696 BLAKE2B 8df6331a45752c5176abb03d1b12888a5f6b062785ca1cb0e1f6bd523326bb454b90638a01406ac40fb32c5154e2943a64ef08b6b3106f76fc574369e3570fe6 SHA512 4efa236b62aca24cb04323236e7a895f8d9fcdc659348dc066ab4b17b6818f790f54de1cb364ab949bb1efb811f9cb065a6b095e1d4ef481d745fd79d81abac9
-EBUILD awscli-1.27.123.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.27.126.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.127.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.129.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.130.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.131.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.132.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+DIST aws-cli-1.27.137.gh.tar.gz 2423020 BLAKE2B 9cdc1cab324eaa2b2bc17418180bf8bec6e34903b427afbd2bceb0c35eb0923b5e7d98e42954f239bf13576b5d10b80c29d15af17e0f230ff79c244b1532a671 SHA512 9d3220b392839334bc077e0ae417b73ae2aaec363a5a3684690eabe790c062f9b428851b02cb2f27b65193c712fc149eb602a33b8f500afc81daed5cd2d3e8db
+EBUILD awscli-1.27.129.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.133.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.134.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.135.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.27.136.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.137.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.123.ebuild b/app-admin/awscli/awscli-1.27.123.ebuild
deleted file mode 100644
index 2d91a172182b..000000000000
--- a/app-admin/awscli/awscli-1.27.123.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.27.127.ebuild b/app-admin/awscli/awscli-1.27.127.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.127.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.27.129.ebuild b/app-admin/awscli/awscli-1.27.129.ebuild
index 62c19f3a63fb..2d91a172182b 100644
--- a/app-admin/awscli/awscli-1.27.129.ebuild
+++ b/app-admin/awscli/awscli-1.27.129.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.27.130.ebuild b/app-admin/awscli/awscli-1.27.130.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.130.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.27.131.ebuild b/app-admin/awscli/awscli-1.27.131.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.131.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.27.132.ebuild b/app-admin/awscli/awscli-1.27.132.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.132.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.27.134.ebuild b/app-admin/awscli/awscli-1.27.134.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.134.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.27.135.ebuild b/app-admin/awscli/awscli-1.27.135.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.135.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.27.136.ebuild b/app-admin/awscli/awscli-1.27.136.ebuild
deleted file mode 100644
index 62c19f3a63fb..000000000000
--- a/app-admin/awscli/awscli-1.27.136.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.27.126.ebuild b/app-admin/awscli/awscli-1.27.137.ebuild
index 62c19f3a63fb..62c19f3a63fb 100644
--- a/app-admin/awscli/awscli-1.27.126.ebuild
+++ b/app-admin/awscli/awscli-1.27.137.ebuild
diff --git a/app-admin/rex/Manifest b/app-admin/rex/Manifest
index d904d80e854a..d0f83a84d502 100644
--- a/app-admin/rex/Manifest
+++ b/app-admin/rex/Manifest
@@ -1,8 +1,10 @@
 DIST Rex-1.13.3.tar.gz 349550 BLAKE2B c2ccc2144e56761d33ed2b5d790febd49863639d2e3bba8028b7937b43eb51e7e59e9e99cb1d67f247b2dff8ef91aa04776afd6277ad8a2370f35d71e0b528dd SHA512 beab22aef8ba620b6e74847698eab99977844d2e9632812a9ae0e1ee303cbe4e5a6489000bd5209d76e42e3bb4bb799a90408ed6fb14e034f68132a4d37766dc
 DIST Rex-1.13.4.tar.gz 351011 BLAKE2B ec046b88f4443b03c05efbabb40900085293c61dab0ee9818a8c4d05be3cc0a1c1f53738b72cc245aaa2dfbcb00541f0e1e31b0c20f2464e9fc6586ed10707ef SHA512 27b76f4b527b42ea0b06dc1de05254dbd6e2fa3bc9a8a708af7557789ef22aec374a5d0585bf3ec4ee878a5387d51b881cf95855dbd05149b7b23929de12027d
 DIST Rex-1.14.1.tar.gz 354512 BLAKE2B e82248fa58b10e92f2256c57b589e8db6fc61a03532eac00a28431f2527b4a7e5fdaebbf4a0bdbdfa5b775be95826fb26fa831b58ecf354d6758f5a26649dc32 SHA512 c3cb3e64fb443858a47fbf0afabc9e57ca0a7646447ea259c109a5385a57b4347664dde23575e529afa17881f400bd1735994793362aa101519747805153cb75
+DIST Rex-1.14.2.tar.gz 355848 BLAKE2B 282abc3a0f9acbb553c3ed1a8efa34298f43e02773461325678e014b7a2ede56399c6d5140ff69dc18dc685c2e5b1f453fa45784e59fe14940c6a638bd104879 SHA512 3ca16b2bc401fd07b7ad7ce403bdbb92fbd9123f58b7f63a20292cd165b4b220317b252f1409a7f90099103de36a9091f01adaf37ec1cacf5abaecd140f34d27
 EBUILD rex-1.13.3.ebuild 6438 BLAKE2B eb30c79b80eb7dd169d011fd6c4df754e6016179ae4f6c02a86404764d4a6a3d1839515670b4f4f765294759af5ff9cad2a1f131fa3193f7dd03c49bbc644f33 SHA512 67c8042bf2f5dcb4bc739fe745bcce55f0f90127390fe60f2f43142dc84e07c23af99b16b487fe8f41e1b4afad4368b2532a1e65120249e431f48ca1e137afcf
 EBUILD rex-1.13.4.ebuild 6438 BLAKE2B eb30c79b80eb7dd169d011fd6c4df754e6016179ae4f6c02a86404764d4a6a3d1839515670b4f4f765294759af5ff9cad2a1f131fa3193f7dd03c49bbc644f33 SHA512 67c8042bf2f5dcb4bc739fe745bcce55f0f90127390fe60f2f43142dc84e07c23af99b16b487fe8f41e1b4afad4368b2532a1e65120249e431f48ca1e137afcf
 EBUILD rex-1.14.1.ebuild 6581 BLAKE2B f3f2a5147d2a1442a3f5e1132f389165d922f5c8184707b14dea42da4f778dc82cac27dfe336be896f7d8ed946c15ce973273e61583d79913ff2ee0248d3ec8b SHA512 622d15521937083446279af62df0d6b376b6f77fd1bf69b59a4eaf2b5d3561968b24aadb59d9400c074a7d2fd1b7e1510b0269f23f697659e2fdc60020af57b2
+EBUILD rex-1.14.2.ebuild 6595 BLAKE2B 29c1fc4cf973d7de484727ceafa767f41452ae55a329703888f41af53194cdf4a9d90a0eaa2ea371c86da7081b5053feba48e8d83d59a58b72538888846c16f2 SHA512 70737daefaf117b6c56ae48a07af671e693a7b1dbcc5ae928dc3800f07bfb975fa2a219bbac9b58705c2742d1928cb220f0017648ec20e4d4a49e75ff7c31f83
 EBUILD rex-9999.ebuild 6581 BLAKE2B f3f2a5147d2a1442a3f5e1132f389165d922f5c8184707b14dea42da4f778dc82cac27dfe336be896f7d8ed946c15ce973273e61583d79913ff2ee0248d3ec8b SHA512 622d15521937083446279af62df0d6b376b6f77fd1bf69b59a4eaf2b5d3561968b24aadb59d9400c074a7d2fd1b7e1510b0269f23f697659e2fdc60020af57b2
 MISC metadata.xml 23997 BLAKE2B 1c0d4d5488171646c777d9d1099ae20abecde3d53fcab1a172a69f866e409c8b9c7db32e7944d48b3ad6a9fdfd4e083907bb891b084c6308585887ceccfeeb3b SHA512 e19019443dd2da2f30dd9a0bde7b3e242c1601bd776faf8312d0973afb05294bce6f22bb7a5657085c6b059f157ad9cd517b2e325b8de9a04db64159f63d698b
diff --git a/app-admin/rex/rex-1.14.2.ebuild b/app-admin/rex/rex-1.14.2.ebuild
new file mode 100644
index 000000000000..51c374850d9c
--- /dev/null
+++ b/app-admin/rex/rex-1.14.2.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+	GITHUB_USER=RexOps
+	GITHUB_REPO=Rex
+	EGIT_REPO_URI="https://github.com/${GITHUB_USER}/${GITHUB_REPO}.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	VCS_ECLASS="git-r3"
+else
+	# This is intentional to stop perl-module.eclass doing magic things when it
+	# shouldn't. Like making ${S} contain "Rex" when the git clone has "rex"
+	# Also prevents perl-module.eclass provisioning SRC_URI
+	DIST_AUTHOR=FERKI
+	DIST_NAME=Rex
+	KEYWORDS="~amd64 ~x86"
+fi
+inherit bash-completion-r1 perl-module ${VCS_ECLASS}
+
+DESCRIPTION="(R)?ex, the friendly automation framework"
+HOMEPAGE="https://metacpan.org/dist/Rex https://www.rexify.org"
+
+SLOT="0"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+DZIL_DEPENDS="
+	dev-perl/Dist-Zilla
+	dev-perl/Dist-Zilla-Plugin-CheckExtraTests
+	dev-perl/Dist-Zilla-Plugin-ContributorsFile
+	dev-perl/Dist-Zilla-Plugin-Git
+	dev-perl/Dist-Zilla-Plugin-Git-Contributors
+	dev-perl/Dist-Zilla-Plugin-MakeMaker-Awesome
+	dev-perl/Dist-Zilla-Plugin-Meta-Contributors
+	dev-perl/Dist-Zilla-Plugin-MetaProvides-Package
+	dev-perl/Dist-Zilla-Plugin-NextVersion-Semantic
+	dev-perl/Dist-Zilla-Plugin-OSPrereqs
+	dev-perl/Dist-Zilla-Plugin-OurPkgVersion
+	dev-perl/Dist-Zilla-Plugin-Run
+	dev-perl/Software-License
+"
+RDEPEND="
+	!minimal? (
+		dev-perl/DBI
+		dev-perl/Expect
+		dev-perl/IPC-Shareable
+		dev-perl/XML-LibXML
+	)
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	dev-perl/Data-Validate-IP
+	dev-perl/Devel-Caller
+	dev-perl/Digest-HMAC
+	virtual/perl-Digest-MD5
+	virtual/perl-Exporter
+	virtual/perl-File-Spec
+	dev-perl/HTTP-Message
+	dev-perl/Hash-Merge
+	virtual/perl-IO
+	dev-perl/IO-String
+	dev-perl/IO-Tty
+	dev-perl/JSON-MaybeXS
+	virtual/perl-MIME-Base64
+	dev-perl/Net-OpenSSH
+	dev-perl/Net-SFTP-Foreign
+	>=virtual/perl-Scalar-List-Utils-1.450.0
+	dev-perl/Parallel-ForkManager
+	dev-perl/Sort-Naturally
+	dev-perl/String-Escape
+	virtual/perl-Storable
+	dev-perl/TermReadKey
+	virtual/perl-Test-Simple
+	dev-perl/Text-Glob
+	virtual/perl-Text-Tabs+Wrap
+	virtual/perl-Time-HiRes
+	dev-perl/URI
+	dev-perl/XML-Simple
+	dev-perl/libwww-perl
+	dev-perl/YAML
+	virtual/perl-version
+	virtual/perl-Term-ANSIColor
+"
+# NB: would add test? !minimal? Test-mysqld, but I can't get that to work
+BDEPEND="
+	${RDEPEND}
+	>=virtual/perl-CPAN-Meta-Requirements-2.120.620
+	>=virtual/perl-ExtUtils-MakeMaker-7.110.100
+	>=dev-perl/File-ShareDir-Install-0.60.0
+	virtual/perl-Module-Metadata
+	test? (
+		!minimal? (
+			dev-perl/File-LibMagic
+		)
+		virtual/perl-File-Temp
+		dev-perl/Sub-Override
+		dev-perl/Test-Deep
+		dev-perl/Test-Exception
+		dev-perl/Test-Output
+		dev-perl/Test-UseAllModules
+		dev-perl/Test-Warnings
+		dev-vcs/git
+		virtual/perl-autodie
+		virtual/perl-Module-Load-Conditional
+	)
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" ${DZIL_DEPENDS}"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		"${VCS_ECLASS}"_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_src_prep() {
+	einfo "Patching dist.ini"
+
+	# This block of sed invocations removes all plugins that aren't
+	# useful for users to have on Gentoo, because all of them are
+	# conditional and subjective style checks, which don't indicate
+	# a real issue for users, and paying the price of their dependencies is undesired.
+
+	# The {N;d} trick adds the [n]ext line after the match to the pattern-space
+	# so that the final [d]elete deletes the next line too. Can be expanded for each
+	# line, ie: {N;N;N;d} deletes 3 lines after the match as well as the match.
+	sed -e '/^\[Test::Kwalitee\]/d' \
+		-e '/^\[PodSyntaxTests\]/d' \
+		-e '/^Perl::Critic::Freenode =/d' \
+		-e '/^Perl::Critic::TooMuchCode =/d' \
+		-e '/^Test::Kwalitee =/d' \
+		-e '/^Test::PerlTidy =/d' \
+		-e '/^Test::Pod =/d' \
+		-e '/^\[Test::CPAN::Changes\]/{N;d}' \
+		-e '/^\[OptionalFeature/,/^$/d' \
+		-e '/^\[Test::MinimumVersion\]/{N;d}' \
+		-i dist.ini || die "Can't patch dist.ini"
+
+	# Removals/additions have to be tracked by git or dzil build fails
+	# Spurious warning during src_prepare
+	git rm -f xt/author/critic-progressive.t || die "Can't rm author/critic-progressive.t"
+	# Spurious warning during src_prepare
+	git rm -f xt/author/perltidy.t || die "Can't rm author/perltidy.t"
+}
+dzil_env_setup() {
+	# NextRelease noise :(
+	mkdir -p ~/.dzil/ || die "mkdir -p ~/.dzil/ failed"
+	local user="$(whoami)"
+	local host="$(hostname)"
+	printf '[%%User]\nname = %s\nemail = %s' "${user}" "${user}@${host}" >> ~/.dzil/config.ini
+
+}
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	S="${dzil_root}" dzil_src_prep
+	dzil_env_setup
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+		has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		# Uses git sources in WORKDIR/rex-git
+		# to generate a CPAN-style tree in ${S}
+		# before letting perl-module.eclass do the rest
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+
+	# If you DIY installed Test::mysqld, but didn't patch
+	# it to handle the fact on Gentoo, mysql_install_db is NOT in PATH
+	# tests fail. So this test is patched out if mysql_install_db is not in PATH
+	if perl_has_module "Test::mysqld" && ! type -P mysql_install_db >/dev/null; then
+		perl_rm_files "t/db.t"
+	fi
+	perl-module_src_prepare
+}
+
+src_install() {
+	newbashcomp "share/${PN}-tab-completion.bash" "${PN}"
+
+	insinto /usr/share/zsh/site-functions
+	newins "share/${PN}-tab-completion.zsh" "_${PN}"
+
+	perl-module_src_install
+}
diff --git a/app-admin/supervisor/Manifest b/app-admin/supervisor/Manifest
index 49f16fa13ff8..a8f709df4eb6 100644
--- a/app-admin/supervisor/Manifest
+++ b/app-admin/supervisor/Manifest
@@ -2,10 +2,6 @@ AUX conf.d-r1 182 BLAKE2B eae951b6dc0252ee7b13988d65addb667d24dc452a2c50644a7857
 AUX init.d-r2 553 BLAKE2B 270ff81ca5bac99f22b49bf47ec64d73b4328804ea264e99301de3d563d2479a3640a0f5e35b2553d679e97a85480d273db170b741638b0a90929fccb490deb2 SHA512 d8d7d6165445fb4bef75454dd2b03c866fb4942c19d6ae4a8b36a900bdd9ee3a55cade02304d49d6e0095df885a1a4fa52694012a7d85d67cc1b181aaf69d8cc
 AUX supervisord.conf 2525 BLAKE2B d36d6ef6b952a99ccfd61976c21eb54922555db4802288d9364f02331da5e693bce3862869248f7c0b81285576ca633e679a26acf75f03b2e620e16eea963909 SHA512 1ce55ef1f9a4cd7592645007af5e0f18147e8dca1c324ac2e48bf58aa2191ec657cfa68d7e6bdc9ba8e0747b32f4e6a44009e8c55a7bd77b265ac8593f51eeb7
 AUX supervisord.service 404 BLAKE2B 87c99a2b388befb04f1d8e3442a5c0b6d802837047c45da2bb7017631bf4af4b858bc4d7964f1d64937e331728884bc21e62e9d01b11cca46aaea389372c6bad SHA512 0fe777d1f0bf70dc9b49132102ac90083261321850f80e9e323459c894c55f722ab8470eba3ba7bb35a9d69ad411a3247546066d6cba5801c9b289350ea4bed5
-DIST supervisor-4.2.2.tar.gz 463657 BLAKE2B 766feffcbd70b575b6b7dfd6ed98e3510e0fd9362c423b677d44a2b5dd23ded14a349a279d3d28d4fd9e04a2175c8f00e24c07df310b61d34c7f69f60d26a4ac SHA512 f787206e6c6a5d3dfc4284974a4a87cbcaeac0c705afb2b8eae53f066413bd9e68095c5309e29625e01469a4748613370e1ac0d7be84b9d72c3623244bdd2eb3
-DIST supervisor-4.2.4.tar.gz 465151 BLAKE2B 91b99a64950dc874bdc008ba53ca8b1962cc34981fee27c2fd82956d73ace9eaaf91439ef6be40530c4860fe1eee193e19b51ab81050f7368aa7d31f8444c785 SHA512 38c55aeadb8664337b667aad891a3a2134ae4af88e90d636054e6be9aebc8a3ef87d79d15fcafd2b9966af562deeedc96ac3730bde9439dde30208f0a874f2d7
 DIST supervisor-4.2.5.tar.gz 466073 BLAKE2B 54b45c824a1ad2960b04ca4ca9e54337f8c4da1a13008b559103f9efb9043588e72b3ee97c41218eb9252606d717575ad2615d12136047734f83d843d0a63bfa SHA512 ea80c8c91356646deccf20735e065fd9b341f3be6d56838d333989297a912b0a59142338925b2eb08690e038f0617814e03447673701a19093aa483432ce6d41
-EBUILD supervisor-4.2.2.ebuild 1630 BLAKE2B dd263d237ed2c75ad54ce1b2e4a5fd49ac14e81c9dfd7478dbf4032068bdaa08c557bf6eecda09f590709fd433c5a46ddbf05a22ceaca917139bb1b59a30b59c SHA512 06c1f4fa1a99cd0b76f200a17ea87b0d4febd5b903c3a76cb7a82cee0f57e5af2e4dc0c12b27c715feb10b4038e3e3de1c61d1bc86b6426f65d1a4432e669ef2
-EBUILD supervisor-4.2.4.ebuild 1424 BLAKE2B df7b7e5b9d09d69ec2d169bacf00dafaec9e701a203a54bf821d996764c1ca758edce731789df0e610cce4de4209c7200f39628bab202c6db7760f9cbfaabe79 SHA512 d07a415c7c63bedaa7f08f87027539ea88f6611f2a1b0bbec4e9323d809b69d6265d8023817db072eb6e448fd86d5313520c8d4e3c82b376f8903a319c0652c0
 EBUILD supervisor-4.2.5.ebuild 1374 BLAKE2B 6a28e2f7b81998db2a032104cb04d2a240957c65896157abb0515c6faed2c5cd2b2f552e4f3ff80b7edb1c69f947e232aec7e2cd0d4ce38f62e4d01f544e6c6d SHA512 da16ca323af9314b15b6f9d6e35262b72c96be18d047bb37fbb24a7cc053cb3c8ff4d5a619a4cad1af37e1eda4f39a4be67a1eaf0198fcfa110608d6649e7ba0
 MISC metadata.xml 624 BLAKE2B 6cb179a9284e7898dcfc4423e12e04d7bd4e805930f8f4e79e3528153180146aeb606040d087e3c5d127e6d7e3b42cbbd6f4b7c1bb2ad7fa414bf90a40a76502 SHA512 dfe5b6abb493cb69a2a2b2d93fbf9c66b4f21ca5d83d76a2da5066f3625a945c1834e876ce8b8b4368cec3e34a81003f7be47898b5e2bdbe796714ea8291f63a
diff --git a/app-admin/supervisor/supervisor-4.2.2.ebuild b/app-admin/supervisor/supervisor-4.2.2.ebuild
deleted file mode 100644
index 7abf6bfe8d59..000000000000
--- a/app-admin/supervisor/supervisor-4.2.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{9..10} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="acct-group/supervisor"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# The workaround can be dropped once this is merged:
-	# https://github.com/Supervisor/supervisor/pull/1413
-	sed -i "/ setup.py test/d" docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}/init.d-r2" supervisord
-	newconfd "${FILESDIR}/conf.d-r1" supervisord
-	dodoc supervisor/skel/sample.conf
-	keepdir /etc/supervisord.d
-	insinto /etc
-	doins "${FILESDIR}/supervisord.conf"
-	keepdir /var/log/supervisor
-	systemd_dounit "${FILESDIR}/supervisord.service"
-}
-
-pkg_preinst() {
-	fowners :supervisor /var/log/supervisor
-	fperms 750 /var/log/supervisor
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
-		elog ""
-		elog "By default, only members of the supervisor group can run supervisorctl."
-	fi
-}
diff --git a/app-admin/supervisor/supervisor-4.2.4.ebuild b/app-admin/supervisor/supervisor-4.2.4.ebuild
deleted file mode 100644
index b21850baeb58..000000000000
--- a/app-admin/supervisor/supervisor-4.2.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( pypy3 python3_{9..10} )
-# xml.etree.ElementTree module required.
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="A system for controlling process state under UNIX"
-HOMEPAGE="http://supervisord.org/ https://pypi.org/project/supervisor/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="repoze ZPL BSD HPND GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="acct-group/supervisor"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newinitd "${FILESDIR}/init.d-r2" supervisord
-	newconfd "${FILESDIR}/conf.d-r1" supervisord
-	dodoc supervisor/skel/sample.conf
-	keepdir /etc/supervisord.d
-	insinto /etc
-	doins "${FILESDIR}/supervisord.conf"
-	keepdir /var/log/supervisor
-	systemd_dounit "${FILESDIR}/supervisord.service"
-}
-
-pkg_preinst() {
-	fowners :supervisor /var/log/supervisor
-	fperms 750 /var/log/supervisor
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You may install your configuration files in ${EROOT}/etc/supervisord.d"
-		elog "For config examples, see ${EROOT}/usr/share/doc/${PF}/sample.conf.bz2"
-		elog ""
-		elog "By default, only members of the supervisor group can run supervisorctl."
-	fi
-}