gentoo resync : 12.05.2022

13 files changed, 186 insertions, 308 deletions

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 879abe366d37..11f30e7db778 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,21 +1,17 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.24.22.tar.gz 8839717 BLAKE2B 7b3843900da913561ab2a99f7371139cd8fd89a2eb52a90b33f8fb4c0449ff23a00f56347a2916b271346acf2c0721af0a9695bff3663888aa87c790705ce4c3 SHA512 070222b5eca46fa5463620af63816bc8813c717a56b4c41294556130390959ac14570a1256542f145a5b36727ced9657b386fcd5f538d64912c8a9f049673bd6
-DIST botocore-1.24.27.tar.gz 8856607 BLAKE2B aa149a79106bc6e9460d2b69b032b20d0fcd9b0a4d7dda04ac656e0681aff378267f5c6bde4e64432f309ad4ed89ff8cae50b0dc92f01086f8fbe433e5347ad3 SHA512 1cdeb2926bfdd54eb6805295982891cb02005c01ee74e3394d8680e486fd924f73322fb9ae56730deaf360b0e60c9fd482759d597eadb3dc180cb099beff487c
-DIST botocore-1.24.32.tar.gz 8884956 BLAKE2B c899ed9b540663fc16e937d98c4c4383b5b0b9c36a976a6b872019bee46edb6db4b9fbe9cf5cebfa5fd1f43d37d21213c90a93802e6d95e4218693269021f5fe SHA512 06142282ff93918052fc6d4832061c65088a5ce8a9fdbfb587be4a1575edf1ed160c58159f25446c7717a841e9ddff00b0a95dd5926a738ffb166b70b42da71f
-DIST botocore-1.24.35.tar.gz 8891601 BLAKE2B b6a56efa73a3f76f51764c4c649d38f2e596fb262624bc5931904318b68a773790f6e4e358cf42567aad0de4e97099699935e6da4c21be66a782f7005fbc15bf SHA512 3c0a7c935798a6dcdd419080a31050301f795ff67b8262673ee4ca09d8344f222ce4b1b7bfff3459089bbcb59c42041281ed8005c1533c34c24542d9a45c353c
-DIST botocore-1.24.36.tar.gz 8899058 BLAKE2B c11df5acef305116433aeb4c4b999b8bdeba278506ac066bae3572f578cd2877827cc8a45d74f57fd10c5e87fdd46f39b951ec4d5bd15f0c484194640813080a SHA512 49256c288b74126595521eabcab750a58a05d07ecf5243ce0626961963326099c3fa3cb571664fb72c0f835624bd79e55e4940c9fc4b03b2b1dc7fd7d3a71213
-DIST botocore-1.24.37.tar.gz 8898823 BLAKE2B 5e5495ba399e910479c0172eb4c572a5c0371db720906586c88dc59d8bfc58a50699b05125e1e554a8571b64654604447be1e1a4bfdc2b992272101060638908 SHA512 412a656e879b09bf9f82d02e291e988499106dce1f589b1048adf2145774a5dd9a9ca5f18d2b6eaedd895e384cbf1836c7b6bdc0867a83c7b863bddea77727f4
-DIST botocore-1.24.38.tar.gz 8900705 BLAKE2B 1f1504856d5908df7d8af9f92847d1d7ac9d8ce0258a63bcea4b593aaae4d87e71da45becadb5873eab53ceea6916e4c6a4931efd797b0474e7bfe4f0b60eb46 SHA512 1cf7cf2acc7773ab9f5c4d01eca24191f6d27e3eddd98abd33348bf171bcaa2708e8c9a03ceb2676060a1f906d66e6982fe3bce3b78ed878abc30434812327c0
-DIST botocore-1.24.39.tar.gz 8901325 BLAKE2B ffdafe7b34c7114de12044d14dd9ba58f01b21455f51a527da55450840f7f74cfaee56babb105b18634b06293ef91427534ea08b47d223285046bd718cc6cc7a SHA512 13c24f4e305bc16441682f483b0478730f5487388d73e14fc3750e22fd3c4c1c958146264721f365b00d1cddd4222e7c0b5d0be26df171ba4e95091327a340c8
-DIST botocore-1.24.41.tar.gz 8906754 BLAKE2B ff2e19dca96137f7e6335ad41ce645d132989ddafecfe8be780166b697bd9fff18eaeddd7a88d4b76cf2aa95c1822f88590940d674ea82e97c14d7bdf6c1d5de SHA512 071fb09c50b3eacbb68ddc5831bb8fceef92e5cb8aad9e4b74b1ab65528edbefc83d0bc86271d87aea97d923813ab1613fe342be0815df7a350edf602dae49bd
-EBUILD botocore-1.24.22.ebuild 1643 BLAKE2B 902344f2d4bf70dbfd8d7d8c3e419fa50e91be1c2b4269266ae932f07408773ff43d58bfb535cc5dfc4f89b33da6120404f082c638380d6947335d4d3ba42e24 SHA512 6804803d1988e28df5155fc483d385fcdfd77530795019f10635d2275e78e060f0668f15f267aeaee68f3ad8c913bb7aeac71422c2409d27f226cc165aee746c
-EBUILD botocore-1.24.27.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-1.24.32.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-1.24.35.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-1.24.36.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-1.24.37.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-1.24.38.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-1.24.39.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-1.24.41.ebuild 1650 BLAKE2B b286bf969ee64868dba6eca2bd16fb2d650e6393f9556a65b1509de19d114399a2005695ce8b7534e5fe35f7404e0bc7fd0f8e52ce675e73f0d6666cc2b3bc42 SHA512 4d56ec33157b7d00724598f0f55c27f3b5e625784b82fa27f2f75c3bb21a97ea7ddc1ac18f34b54da34454bac53af6617ab20f4f2caef51adb9b2f6e35906f82
-EBUILD botocore-9999.ebuild 1646 BLAKE2B dd0c215ddae91bb93f37f150ea10ee1efdae56f39d878f977f5abad8918d9da64063345faeef31d7c7f0beddcc7374810380ab0b049fdac9f1f49d58976ae788 SHA512 ce261fe481bb083270a8c8e706556164b2eea45a5091590d30b0671f3e4948ad03b46d37e555096cb244405c8a56db12fcd0c46fc85122640bd3818760e5851f
+DIST botocore-1.25.10.tar.gz 8963726 BLAKE2B 9823581417f4ddbca840fec85421c01089987ae53fff3825463a79e2663c753d0aa00c2f3dc714d5bf62ee491b4521964869c8e39c5f88ebd562676267b35831 SHA512 6daaec14be1cafdf43bdb4b182a31649d88ee3a9b7e2a88409e3a9fc5279479f78800a0b49ec405936e6695ac4c1b672a62b31b2486049193734ade98f275a10
+DIST botocore-1.25.11.tar.gz 8965078 BLAKE2B 9303ea0c5bd298be3167a887bf8a5b66edbe0f2c82273841daabf975c1f78f18e80092252d0c9c79e05992039ea1048cfe36f4ecf9e5a941e2ad80f7a7ede314 SHA512 2afe95fc0ee2d50e87c6ffc8cbd189fea71f0a97ce508c01642f0a736cb2fe220531324366fddad3e725bc81ca4ef3ffdf2c281c3c89075cae5416f5722b1b1d
+DIST botocore-1.25.12.tar.gz 8964692 BLAKE2B f039aa570d74a2fb5cacfb4d43ab2e34c677f471a6d325fe02afa2aa7231960dd70f13b8b0c988fbf9c0dec2bda7b95ac2069b00233211c30aa2d9e0cf287747 SHA512 da88d66db527216f81101fe30a2c90cf423025bbe28d7fda227fc80b9a33696c63630a885e5809810688dc80eb274898301a3877855c904b8c8bd8b85edc12a3
+DIST botocore-1.25.4.tar.gz 8955210 BLAKE2B 50880e9d7f57e4f3b8662625a64e9470eaf8a984fdbcc34239bfe604544ccd3ac62e953d7be4e1b486fab4ad0d571361ffc9fdc43cb860cd37a95c33d7b824b2 SHA512 a04e03271d217ab1ef5488dcfedda2904b8e628dae969c74e284d004ae72f18d9734d3f7cf775235c8384b30f4d0fbfda7c0e5dcd687039ddb7b339330e63317
+DIST botocore-1.25.7.tar.gz 8961319 BLAKE2B 1d22e3cd625252f1e6c6b13b9317750b48765150006ca0b632fd15aa6f31079855a1b6c7201cbed0ebfc7147a87389e1a4445d0736829554f8063b68944107cf SHA512 a22a35a1de87aff2efa7b4b5f478e44be7ce2eadf0b7da43af2a0de9ba315a9b75ac59da29a8f10ed15bbf6ff4d76d904407f95a7f8f08049c546450bd6c7c4d
+DIST botocore-1.25.8.tar.gz 8961194 BLAKE2B 4a13f5b01352ff0cb8932431e9431229a73fe922c2719ee571fa26ed55faa0315e0bdd561dcf2069748d13c809c7c5b7e2a35051d5d8bbd498677658b69ff454 SHA512 bc78c24629308d4d8cb4190646b7f465713a5462c54ff0946fdbcfa8b87951fa337a2f8f97bbd27991a79da03d140b890f2b021f865c7550b791d2fbb95282a1
+DIST botocore-1.25.9.tar.gz 8962451 BLAKE2B 5930499f514d5e9b9f0fa0c87a2461071a0432bb3957779a4669448bd7b34e94a5339598703419f36c01e505c8487217a4f525ce63832bc97ad35ef584ef45f3 SHA512 533c5ff383e53aa2b00a83b182207e9dd2d40ea000c7a0f1e74e30989c6c15f54fd26eb67375ceeb90c1a6ab158bda7de75ac40fe6b14614209ebb7063b9e2a1
+EBUILD botocore-1.25.10.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
+EBUILD botocore-1.25.11.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
+EBUILD botocore-1.25.12.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
+EBUILD botocore-1.25.4.ebuild 1683 BLAKE2B e8712dc3f3372683dfdde06aa37a7d6ca1702499d6f58fe4ca0b4eb99c25a1ea6b7ee8600f4407c93d747f28fe1034af36540f80a1f884b561de84bec2c5713f SHA512 6c94b413dc118624ea507d86e8e19e4ff1c3f32e0d9ade7e4a280894cc3164b0823e41686d2ee504b96d69a4b8b1e68575dd46fd5c6d3f40a4f25cd1b9bfc499
+EBUILD botocore-1.25.7.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
+EBUILD botocore-1.25.8.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
+EBUILD botocore-1.25.9.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
+EBUILD botocore-9999.ebuild 1657 BLAKE2B bfd0f1e50b615868be41392bf859d4a6ec077bdf79d16234621787191ad2e0c1cb1367d0f53e905ff2a42767ef9df4830bb8f889a3425536a7f3115d3c98c84b SHA512 e12279c678c7c8e58cc5c8226af6f0b57e2d7c42af36d32d1066c02e80d06a38a8c18dd98fc1d5e3453699091b3bb4d69afa5edf789c304c498e15c5425adf9e
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.24.37.ebuild b/dev-python/botocore/botocore-1.24.37.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.37.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.38.ebuild b/dev-python/botocore/botocore-1.24.38.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.38.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.39.ebuild b/dev-python/botocore/botocore-1.24.39.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.39.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.41.ebuild b/dev-python/botocore/botocore-1.24.41.ebuild
deleted file mode 100644
index 3bf7c7cfb689..000000000000
--- a/dev-python/botocore/botocore-1.24.41.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
-)
-
-distutils_enable_sphinx docs/source \
-	'dev-python/guzzle_sphinx_theme'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-	)
-
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
-}
diff --git a/dev-python/botocore/botocore-1.24.36.ebuild b/dev-python/botocore/botocore-1.25.10.ebuild
index 3bf7c7cfb689..a1a5a4e1ea37 100644
--- a/dev-python/botocore/botocore-1.24.36.ebuild
+++ b/dev-python/botocore/botocore-1.25.10.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -63,6 +66,5 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
 }
diff --git a/dev-python/botocore/botocore-1.24.27.ebuild b/dev-python/botocore/botocore-1.25.11.ebuild
index 3bf7c7cfb689..a1a5a4e1ea37 100644
--- a/dev-python/botocore/botocore-1.24.27.ebuild
+++ b/dev-python/botocore/botocore-1.25.11.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -63,6 +66,5 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
 }
diff --git a/dev-python/botocore/botocore-1.24.32.ebuild b/dev-python/botocore/botocore-1.25.12.ebuild
index 3bf7c7cfb689..a1a5a4e1ea37 100644
--- a/dev-python/botocore/botocore-1.24.32.ebuild
+++ b/dev-python/botocore/botocore-1.25.12.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -63,6 +66,5 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
 }
diff --git a/dev-python/botocore/botocore-1.24.22.ebuild b/dev-python/botocore/botocore-1.25.4.ebuild
index f6855cd0f126..6a12bd736d2e 100644
--- a/dev-python/botocore/botocore-1.24.22.ebuild
+++ b/dev-python/botocore/botocore-1.25.4.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/botocore/botocore-1.24.35.ebuild b/dev-python/botocore/botocore-1.25.7.ebuild
index 3bf7c7cfb689..a1a5a4e1ea37 100644
--- a/dev-python/botocore/botocore-1.24.35.ebuild
+++ b/dev-python/botocore/botocore-1.25.7.ebuild
@@ -9,7 +9,10 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -63,6 +66,5 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
 }
diff --git a/dev-python/botocore/botocore-1.25.8.ebuild b/dev-python/botocore/botocore-1.25.8.ebuild
new file mode 100644
index 000000000000..a1a5a4e1ea37
--- /dev/null
+++ b/dev-python/botocore/botocore-1.25.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-1.25.9.ebuild b/dev-python/botocore/botocore-1.25.9.ebuild
new file mode 100644
index 000000000000..a1a5a4e1ea37
--- /dev/null
+++ b/dev-python/botocore/botocore-1.25.9.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 35239170e3a4..a1a5a4e1ea37 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -5,10 +5,14 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1 multiprocessing
 
 DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="https://github.com/boto/botocore"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
 LICENSE="Apache-2.0"
 SLOT="0"
 
@@ -22,7 +26,7 @@ fi
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
 "
@@ -62,6 +66,5 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
-	epytest tests/{functional,unit} \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
 }