gentoo resync : 29.12.2022

15 files changed, 347 insertions, 214 deletions

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 11f30e7db778..fb726c7febb0 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,17 +1,21 @@
-AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-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
+AUX botocore-1.26.0-py311.patch 2164 BLAKE2B bbe6b3db1a2369293894e8d7ef610301223e0e569b1b21d5ade581af42f09ac59a67a9b8e960140b81a184b4bc0962805c6cc352253f3cbeb411563bd3d1a74b SHA512 375589f268b37a9c92f816887356f1d1713d182126566dfa8abd370df605f77a55aca88a5562182fe8b1574f402409ce6bfe49b0c6705f7f06e441649ae5aa99
+DIST botocore-1.27.12.tar.gz 9132872 BLAKE2B 74b74b5a5745cfacac066d5e087974fb58be5a600c7cfb2077d243044b8c429b1396d19e6790c0f754e42931085b115f74039b8c93da39593512d28021d6314a SHA512 767defae44ffb3b54b55625fd0f8a20c22a4a5f209a1397b1a27cfc2e36ac9e03cfdd25bc77bebc944613c5744dd7651e1b574674e8a992f219e172eee9210f5
+DIST botocore-1.27.13.tar.gz 9134638 BLAKE2B 471a46a4c4f14082ceb7030495a121ea90a6f67b6f802cbeb1394624513ff86deb7b90e3aa3e568dff42cd3280ea038565752eff69577231250b6542e6586e1f SHA512 6becb7cd6d2ea3b09012f7b168dcf7fd3386c19ee6003a4e8f4059e3b1ad2b281f5fdaab7abaafe6c34bccd547c8f8ef1bc253f5190d3e91127b1239ec8e307a
+DIST botocore-1.27.14.tar.gz 9134503 BLAKE2B ca29a33c5363457053f8ac042279726a15d3dc5f72546558d11bbacd79e7641d94b1137b76e201ad00203ecff53274fd41abd9178e7abbc1c5a51fe388f7fa5e SHA512 3995918212559eab009f141f94e6e6496fc77f12438e1dd62ce3ee232009b90de3882d342d20e83eb11de5f35b7878f53eea884016874caacb9d2e3d167b4f1a
+DIST botocore-1.27.15.tar.gz 9134585 BLAKE2B 33fcf026334e0be28b7f20b78e072d4eed85e857438319dfe6a1aefb2aeb287aa7a4d6b5f40cd47b9ca5e904263bd7716e58fe2962a75fa64ffea8da383fd527 SHA512 15a65137b131220863fc7fb4c085d83b858a673ee49370bc8d5ce8433f2ee3c99dffd102830da10ed1c4fa4a6f5fdc5f543be4e88646f981409fb855ea100932
+DIST botocore-1.27.16.tar.gz 9138117 BLAKE2B ed636cd031445b14f57282326836616dca626c27ff912b5a2014df83c5574264f773d9ab8aae2f01b55bb810d00233f1a4cceb0f746767247b5954bb8739b7be SHA512 c4b1debe648cd3027fe409f4ec095a4b454050ec427e8a11e04bc1f82d452566d2168dd539d5dc687e46e612f3d47e218d99de9510156e19eac477ea3c0259d2
+DIST botocore-1.27.17.tar.gz 9130505 BLAKE2B 04c6b37f3b42a0f9fb696b5213338b004418a68c754f5027ad447119fb20556dc49bd53f40fd9560ea3f5bdcf2afbe151dba68e901079baec770f9f223b1a894 SHA512 b1a145d3c97adfd4df40639da99e1c34087508be189d5818ee7176f20454f2897a6f518a14b4bfbf41cb169a17188bec467337c10d0ad511e223f0c1ff5b64ee
+DIST botocore-1.27.18.tar.gz 9129942 BLAKE2B 61c06ec3ec8350cb9c43c5716faabe5035b74907fd4a94f9b007ec6e488ffb38a9d75d5b3372fcbbd26cb7f9599ba185cbcf2fb48f7e5900e0028832bef74187 SHA512 9eb700af06b1eca88df77ad46a54a73bbd198d36b055ea219c8948557bda7edd0307f48321c416c3128fe2baacc35aaea10f31c57b43511a512c6c7c46b0a6db
+DIST botocore-1.27.19.tar.gz 9132910 BLAKE2B a23d64ec934de03f7c31b1c89229d5054e689fd050a74db7467b31c79c38eb732286d4db747ca132fa9917be79abcac27b3423f9d0a0e9c9477f56c2ace3944e SHA512 28ab3d94c8f3763b42bd36c97787ce8f86bd8958cfc1b63fd445713fcea523ed1be615a699d0476a3fa8798eff791791c6a466845b63d1454a6aeee6bf9425a6
+DIST botocore-1.27.7.tar.gz 9102259 BLAKE2B 094ec463531f1dfd54ff32d0f44ebc39cdc0a6d4c3e19b49a25e25d9d13acdcd26c782c1d4819ea4f1cb8954a858aa6e997411785678700b7ca03cd8844527b5 SHA512 d4a1327f4314279548af00fbc6da2f9fc5f25f704da3f6ddfa90773878f28ac9f03556b00fa4c0207ec2e952eb716aa98c1c22abffbd51d82dc55d9e4ceeca5c
+EBUILD botocore-1.27.12.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.13.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.14.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.15.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.16.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.17.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.18.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.19.ebuild 1579 BLAKE2B 6223a51641d2a9a33b13fb58d2cb65f1722824f1be352966b98e6da851c83a5c67d26ab3274250cb5e3084dc0b9afe34aa320746d1e09b21f1927dd27875e31c SHA512 f181b6a3f1c9047acad789651b36666cd97ce046b9b0449c8b0162d2fbbda45ed6c30a1ab43228693215ca324079689e622aada7084d2b3516805f96984aa484
+EBUILD botocore-1.27.7.ebuild 1628 BLAKE2B d42a7b3e64fa2a66eb055490c1525faedaf9178fcfbb8aec42fa09841ddca13b276a8872699d7e5b2cea725fd2e835570a59c2eb9783a63bb728266499185321 SHA512 cacfaeb4cee9165055b59b287a2bcf73759c4d1291b3fd0831ca309ef6937347655be22c715328e212264c62e41bd03b024eed020826b07165f5518e52f4729a
+EBUILD botocore-9999.ebuild 1635 BLAKE2B fa5b1fc2a47df0e4f5932aa89a5f84d50b25e36b186cc87f8acd3069bae7eda9ba405a99fd38633480cc5bcefebdfac8456aa49a855d7a221c05d329b211b18a SHA512 1dc2cd74fc9d7d205abba35e494f2189e7ba4dfdd2ded0e7fdbfc44c6aaad840074c5b676bbe2aadc84b738e1223d26d8c9e4ed57489503482879a49b0da1305
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.25.8.ebuild b/dev-python/botocore/botocore-1.25.8.ebuild
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.8.ebuild
+++ /dev/null
@@ -1,70 +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/
-	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
deleted file mode 100644
index a1a5a4e1ea37..000000000000
--- a/dev-python/botocore/botocore-1.25.9.ebuild
+++ /dev/null
@@ -1,70 +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/
-	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.10.ebuild b/dev-python/botocore/botocore-1.27.12.ebuild
index a1a5a4e1ea37..830c713f6036 100644
--- a/dev-python/botocore/botocore-1.25.10.ebuild
+++ b/dev-python/botocore/botocore-1.27.12.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -37,10 +37,6 @@ BDEPEND="
 	)
 "
 
-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
diff --git a/dev-python/botocore/botocore-1.25.11.ebuild b/dev-python/botocore/botocore-1.27.13.ebuild
index a1a5a4e1ea37..830c713f6036 100644
--- a/dev-python/botocore/botocore-1.25.11.ebuild
+++ b/dev-python/botocore/botocore-1.27.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -37,10 +37,6 @@ BDEPEND="
 	)
 "
 
-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
diff --git a/dev-python/botocore/botocore-1.25.12.ebuild b/dev-python/botocore/botocore-1.27.14.ebuild
index a1a5a4e1ea37..830c713f6036 100644
--- a/dev-python/botocore/botocore-1.25.12.ebuild
+++ b/dev-python/botocore/botocore-1.27.14.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -37,10 +37,6 @@ BDEPEND="
 	)
 "
 
-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
diff --git a/dev-python/botocore/botocore-1.25.7.ebuild b/dev-python/botocore/botocore-1.27.15.ebuild
index a1a5a4e1ea37..830c713f6036 100644
--- a/dev-python/botocore/botocore-1.25.7.ebuild
+++ b/dev-python/botocore/botocore-1.27.15.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -37,10 +37,6 @@ BDEPEND="
 	)
 "
 
-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
diff --git a/dev-python/botocore/botocore-1.27.16.ebuild b/dev-python/botocore/botocore-1.27.16.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.16.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit 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}]
+	)
+"
+
+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.27.17.ebuild b/dev-python/botocore/botocore-1.27.17.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit 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}]
+	)
+"
+
+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.27.18.ebuild b/dev-python/botocore/botocore-1.27.18.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.18.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit 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}]
+	)
+"
+
+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.27.19.ebuild b/dev-python/botocore/botocore-1.27.19.ebuild
new file mode 100644
index 000000000000..830c713f6036
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.19.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit 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}]
+	)
+"
+
+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.4.ebuild b/dev-python/botocore/botocore-1.27.7.ebuild
index 6a12bd736d2e..c95d40f1e265 100644
--- a/dev-python/botocore/botocore-1.25.4.ebuild
+++ b/dev-python/botocore/botocore-1.27.7.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -38,7 +38,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
 )
 
 distutils_enable_sphinx docs/source \
@@ -66,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-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index a1a5a4e1ea37..2fb86c59b25e 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 multiprocessing
 
@@ -38,7 +38,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.26.0-py311.patch"
 )
 
 distutils_enable_sphinx docs/source \
diff --git a/dev-python/botocore/files/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch b/dev-python/botocore/files/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch
deleted file mode 100644
index 49fd3adef376..000000000000
--- a/dev-python/botocore/files/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 78077a5e80c9ad5f909037a48100481ddfedc6b2 Mon Sep 17 00:00:00 2001
-From: Andrey Utkin <andrey_utkin@gentoo.org>
-Date: Wed, 13 Dec 2017 01:50:03 +0000
-Subject: [PATCH] tests: pass all env vars to cmd-runner
-
-cmd-runner was started with no environment variables inherited.
-This breaks tests when run with custom PYTHONPATH, which is useful for
-testing botocore while not being installed in standard locations.
-
-One case when this is important is performing tests before installing
-the package in Gentoo Linux.
-
-Link: https://bugs.gentoo.org/640726
----
- tests/__init__.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/__init__.py b/tests/__init__.py
-index 74a2e4de..fa0b819b 100644
---- a/tests/__init__.py
-+++ b/tests/__init__.py
-@@ -145,6 +145,7 @@ class BaseClientDriverTest(unittest.TestCase):
-         if self.INJECT_DUMMY_CREDS:
-             env = {'AWS_ACCESS_KEY_ID': 'foo',
-                    'AWS_SECRET_ACCESS_KEY': 'bar'}
-+        env.update(os.environ)
-         self.driver.start(env=env)
- 
-     def cmd(self, *args):
--- 
-2.15.1
-
diff --git a/dev-python/botocore/files/botocore-1.26.0-py311.patch b/dev-python/botocore/files/botocore-1.26.0-py311.patch
new file mode 100644
index 000000000000..8caa8765c008
--- /dev/null
+++ b/dev-python/botocore/files/botocore-1.26.0-py311.patch
@@ -0,0 +1,54 @@
+From 46a3d92e29a03f547d85861bb6e21281b6a42e60 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 14 May 2022 19:38:23 +0200
+Subject: [PATCH] Replace deprecated inspect.formatargspec() with
+ inspect.signature()
+
+Originally submitted by Hugo van Kemenade as #2507.  Modified by me
+to remove the first positional parameter like the old code did.
+---
+ botocore/docs/method.py | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/botocore/docs/method.py b/botocore/docs/method.py
+index 0f7c60f6c..44c97d6e4 100644
+--- a/botocore/docs/method.py
++++ b/botocore/docs/method.py
+@@ -11,6 +11,7 @@
+ # ANY KIND, either express or implied. See the License for the specific
+ # language governing permissions and limitations under the License.
+ import inspect
++import types
+ 
+ from botocore.docs.example import (
+     RequestExampleDocumenter,
+@@ -101,14 +102,18 @@ def document_custom_signature(
+     :param exclude: The names of the parameters to exclude from
+         documentation.
+     """
+-    argspec = inspect.getfullargspec(method)
+-    signature_params = inspect.formatargspec(
+-        args=argspec.args[1:],
+-        varargs=argspec.varargs,
+-        varkw=argspec.varkw,
+-        defaults=argspec.defaults,
+-    )
+-    signature_params = signature_params.lstrip('(')
++    signature = inspect.signature(method)
++    # "raw" class methods are FunctionType and they include "self" param
++    # object methods are MethodType and they skip the "self" param
++    if isinstance(method, types.FunctionType):
++        self_param = next(iter(signature.parameters))
++        self_kind = signature.parameters[self_param].kind
++        # safety check that we got the right parameter
++        assert self_kind == inspect.Parameter.POSITIONAL_OR_KEYWORD
++        new_params = signature.parameters.copy()
++        del new_params[self_param]
++        signature = signature.replace(parameters=new_params.values())
++    signature_params = str(signature).lstrip('(')
+     signature_params = signature_params.rstrip(')')
+     section.style.start_sphinx_py_method(name, signature_params)
+ 
+-- 
+2.35.1
+