gentoo resync : 05.12.2021

13 files changed, 164 insertions, 219 deletions

diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 71ae6b38df15..de9f70a725b8 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,23 +1,19 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
-DIST botocore-1.21.53.tar.gz 8221904 BLAKE2B 79a87c9678fad9f3b4503740d9857579850eb2e6cf8371e233b9957b031e79aa04f28ce35b96826bfa4ff08c84a7ec646c8cd4302e5eb785530e8f3e2bf9b2f2 SHA512 0a3704d68a09a1afe53d4321d327036f4581d8c6942bc02f594c26d24fa2a60cfbbfab595cc3c4a4e9d3439790835739f7be8c3b572536feb655646c7800cf61
-DIST botocore-1.21.60.tar.gz 8253381 BLAKE2B f035a335f8d72c182f6fbd3f2216608bd5683e70ae11fd8646ff81416262ec802aac5b084f0cf96d23fd6767bbe678e35b24377d82186440b3ee55c977b42643 SHA512 7e801f67c670a85ebd0641fe8a51890dcea1a3a6f2253cca1213ee96a20497c1196c16b2576bcd2dc796b501117d609240c59b1077bbdc0f3021cf6659289e21
-DIST botocore-1.21.65.tar.gz 8261668 BLAKE2B c955019d06aa1b2f4503673b7d9009e5d6e07ee4348e730e6b4d11285f3030f676f0efda58a72dd92cac8c6ba0cb57f8f879eb5298009ecbd227904d18a453bf SHA512 955d24d2d486524af7bee57a56e2e903458030420198f3e6ab49d61be52b812a98444a9d0f86503b121270d6642345ffad6053ad143374dc56ab908b385afb0a
 DIST botocore-1.22.12.tar.gz 8343683 BLAKE2B df7b2c86f226df14dc8181e8506acc7dd660797311049e2342ec721e853af1158c845749a8143ec6677601420ce6140173da8df5d9e4550cdf9becfc944ebd3c SHA512 0ab78902711960f8373a91af379b4981ab29646cc9f94e49836deaa432695c503879ed0bbbf54e3641e50933b5ed658e48052ca2b8b8391f705284d9abd24c1f
-DIST botocore-1.22.5.tar.gz 8301083 BLAKE2B 91f9d38e7c5bcb0b8f58c04547ad45489f58d2240c6b7301cf632969a4a73cf4a1d51c8c68c8def27653c10041d2163ad7ca800dcf6fd07972b506bf2566cae3 SHA512 710a9eeee03dc79ca4ffacc4974f09ca769e1e3b8cb143f6f0349240dd8c2af8ee526a1dadb7310a26019363f683fc4149cb4c73d8b94a856a384fab7f84fb5c
-DIST botocore-1.23.1.tar.gz 8353252 BLAKE2B e29dc3a2112c24f244d25336964605ba14a07f9db3f0462db911f9a1009846dc3601ae27bad05e8e58161e911a20ecbaf1f280bd61204a7392906f0553dcec64 SHA512 6938f54a98474aa0bb3c73249f81bc68cb364d381af3f08ac698d66b9f03c2b3649a253bafb57a6f525757f459a8c3da775370f64984be4bca0f2d4310f7a367
-DIST botocore-1.23.2.tar.gz 8356426 BLAKE2B e8ab05b2adb4892460e681ac815461fd917005dc71baf7996b621855c69f5871e012441e3b788dc3d128e615607a711bc2705e65ed1eeefa9fd1b97d980a79af SHA512 a2a741ec5a58a3fce9002f719e03bc2e3cb86f85c84868167b38820e36b16d0a495b0c74b97479f6e0f976b9a0fedfe968f8d738217f61ba780a47a7a046ffb4
-DIST botocore-1.23.3.tar.gz 8367493 BLAKE2B 6e7c27dd69d1256b1d874b330537fb76dae348986ba5764f0568b1e1092b3bb1c069aedb3e6410562a8210a615ca4b1f792fe05d531a08c7c015c47f8ca5f053 SHA512 a7246fbe64df68f49755008de542cce4c166e2421f339cdeb5e45a9e66562bbf9e497b1fdb6014fceedd10db9d1d96d38c19bc77c5d68bec4259621ab0ed0429
-DIST botocore-1.23.4.tar.gz 8368440 BLAKE2B 62756f2449b66bc970fd9b391afca8e2a71ffb5cbb3d7c33938916bbd4da29bca8e616000554eb25dc0f5f40143c6dbb381da09cbebd37a66ec2f3d40c0863d8 SHA512 417e6b2b4d18acb03eba8c3e5a58ed0c790d630fedb571e33e5e79020272442078c3276c5be9853a815f1b0b2b5143e85bc2ed3f46ca8cee2f7fe45fa59c5bfb
+DIST botocore-1.23.14.tar.gz 8486875 BLAKE2B 93a3fd40b26d026dcee10172e560b4d59cdea803964e0f7ec85afbdd371d700ddc1594aad895730fc82d6684db4aa041b9c0e4e1b0b17ad701e5b87d082ca1ee SHA512 900afcb4d7378e1bd1f7a9dee1f6809151ad161f3442a7e197b2986db41af998d550d21ea225f66d1ff6374853da7bf13166186978edda08139a2c3093ff4b6c
+DIST botocore-1.23.15.tar.gz 8499971 BLAKE2B d08fdcb398cd6bcb63a8922ebfb0f1c32c62190fb04e79e38db13ff51fbf45a0e1191037266ec4e96bb67d1c48e2510976a79591b06a7bb6d0cd57c89f8c81ce SHA512 df57fc9698d5bd5babbd0e94b4150fa287ecb3b32453532fe7cc87bb7dab87d181a7bedb85a57ca250987539f92b832e3a368d9faa39ae5ac641688d3907f818
+DIST botocore-1.23.17.tar.gz 8604819 BLAKE2B f6be48e3d0a2397be4934d9adaddbc4f2d70b2b002585e3057aead69ba934f4e53fcbffe7ea3f5919aa85d1cefe8c1abf6d1e150af6a18bd96561901d1ba7f87 SHA512 fecbb2f2ac451ffc97d7d8ad8224c3d1eff81fa225839199f403be9428cea203c077beb7c05e412784d8b6bedace3c1f24ca45730cc7877961931ac14912d1e1
+DIST botocore-1.23.18.tar.gz 8647407 BLAKE2B a1c5a9006d0e2214ad1fc89752043832e657a2bb1994b9b91981430d6544818d79d669cbdf8e41b4cd6880dfb6bf001dfc03e9616da4873a89b0c3f8fcd3fdc5 SHA512 65ec3aad0508dc9a4d0426658b5a0dfec011613d236248726f94e128c2b762ac652fd5078973a9a7a101cb1a01c3dadc52b272a584310cf76ca798884c06f25b
+DIST botocore-1.23.19.tar.gz 8666566 BLAKE2B 617704ba2bb367f864a6b493be9b643e52f8c22041d255252aae5e21c684544db1d58fc06f920e20ddfa54b8a3c166627d046b79d6ef06db2cd034fb58397258 SHA512 6a551cd50ecbad954982a7e6296c803a20d28065df04c9ca482b91aa91b6f336df8f81fd706771c0f04d55e2f3803cc4f1ec9b347e490e492515df427f52a692
+DIST botocore-1.23.20.tar.gz 8668630 BLAKE2B 3b6b65dd73886bf05ec52fd8e2a3d139f29b56019647f66191578d46dd68bb6c71136632cc6576d8fad84f931990c929e30135e74e9f2125bef14b1cfddd35e4 SHA512 f60df34af21a1d2f8c0d85352404ada5c83eb2bf9190fbe2b9f371c02e95bd23fc2b1e9e857a66057f93af62d1c30b908fc343a1505ad1cca0f245a94026ea17
 DIST botocore-1.23.5.tar.gz 8374467 BLAKE2B 467092e7d8aa5ccb756132669049865445a47205913964c1c944b20caaf100b1efdd1bf3af9c5416ff079b487e6d4d08ffe6208e2b352d09655cc5be21c88739 SHA512 6afca19b724f9019f21e5993ce970d605b95d31c1a4e969ec1b4080510a5a120b3fa0cfd5ade973a9203bd6b7983a3dbca2f7a03108a9167392efd60d5e2fe9b
-EBUILD botocore-1.21.53.ebuild 1105 BLAKE2B 67442baadc85283cd67ea7877938531c70e59285747e631dbfa9ce1519e646af98169ff4ef538cc6731874a06ee3f2948fcf763abbf889a3e3b2d73ebf1cb69e SHA512 73b94ac5892d16aeecf54be238ca180d909885bfea39653d4aaa9e80dbc89aa3f0b040bff51200eaaf25d3642a43f1341d5dc3c27dd65891c368ada5d0ab3a82
-EBUILD botocore-1.21.60.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.21.65.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.22.12.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.22.5.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
-EBUILD botocore-1.23.1.ebuild 1492 BLAKE2B 1f5aeb1848517bde30f48ac3062e0d9970cf574722fafc085ec08286932b449d6c36933c27201a785b8f986fb40d791cde6fbec6fcd397276c2a0d1677ce3e61 SHA512 773a413ac1394fb6d3a183fc41cf4e8fce184e7f8a470f215ec75ae19f47a792a1ba7701e7765a5ad9480e458136904670608a769f1a323ad1b2f0b55963bd85
-EBUILD botocore-1.23.2.ebuild 1492 BLAKE2B 1f5aeb1848517bde30f48ac3062e0d9970cf574722fafc085ec08286932b449d6c36933c27201a785b8f986fb40d791cde6fbec6fcd397276c2a0d1677ce3e61 SHA512 773a413ac1394fb6d3a183fc41cf4e8fce184e7f8a470f215ec75ae19f47a792a1ba7701e7765a5ad9480e458136904670608a769f1a323ad1b2f0b55963bd85
-EBUILD botocore-1.23.3.ebuild 1492 BLAKE2B 1f5aeb1848517bde30f48ac3062e0d9970cf574722fafc085ec08286932b449d6c36933c27201a785b8f986fb40d791cde6fbec6fcd397276c2a0d1677ce3e61 SHA512 773a413ac1394fb6d3a183fc41cf4e8fce184e7f8a470f215ec75ae19f47a792a1ba7701e7765a5ad9480e458136904670608a769f1a323ad1b2f0b55963bd85
-EBUILD botocore-1.23.4.ebuild 1492 BLAKE2B 1f5aeb1848517bde30f48ac3062e0d9970cf574722fafc085ec08286932b449d6c36933c27201a785b8f986fb40d791cde6fbec6fcd397276c2a0d1677ce3e61 SHA512 773a413ac1394fb6d3a183fc41cf4e8fce184e7f8a470f215ec75ae19f47a792a1ba7701e7765a5ad9480e458136904670608a769f1a323ad1b2f0b55963bd85
+EBUILD botocore-1.22.12.ebuild 1105 BLAKE2B 67442baadc85283cd67ea7877938531c70e59285747e631dbfa9ce1519e646af98169ff4ef538cc6731874a06ee3f2948fcf763abbf889a3e3b2d73ebf1cb69e SHA512 73b94ac5892d16aeecf54be238ca180d909885bfea39653d4aaa9e80dbc89aa3f0b040bff51200eaaf25d3642a43f1341d5dc3c27dd65891c368ada5d0ab3a82
+EBUILD botocore-1.23.14.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
+EBUILD botocore-1.23.15.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
+EBUILD botocore-1.23.17.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
+EBUILD botocore-1.23.18.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
+EBUILD botocore-1.23.19.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
+EBUILD botocore-1.23.20.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 EBUILD botocore-1.23.5.ebuild 1492 BLAKE2B 1f5aeb1848517bde30f48ac3062e0d9970cf574722fafc085ec08286932b449d6c36933c27201a785b8f986fb40d791cde6fbec6fcd397276c2a0d1677ce3e61 SHA512 773a413ac1394fb6d3a183fc41cf4e8fce184e7f8a470f215ec75ae19f47a792a1ba7701e7765a5ad9480e458136904670608a769f1a323ad1b2f0b55963bd85
-EBUILD botocore-9999.ebuild 1112 BLAKE2B 9adb64a8f00614dff4f8c92a09cee98dfb30e13e6635b66bdf10f88e1d060ba312dadf0ef2454b9b56e64792846cda09b6300e583d2883a3e78770b19ab67c71 SHA512 e28658fbb03107690c90fea58203245728424bc9df4e958de8989ac3fc64bfc5f45544716d6ec8cb4804fd7d202cdc15a01f8ccff51462f259b543423952c0ab
+EBUILD botocore-9999.ebuild 1534 BLAKE2B 259fabf9a72774556dfa48afa21dcc83d8f3c98f13c55f838d617c64461e24aca98faf226bebf05f0bd7c36759c73d7d3d8447752dc10278d3fe1152296e6722 SHA512 af520fd2e28dcab33131776421d99ed2cd15a688ca5446a9cd21bdcff9d629592e0a3b4f09727167f2ba1ff227b7ca16cdd06620a98b99e3d0283d8d71c2c747
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.21.53.ebuild b/dev-python/botocore/botocore-1.21.53.ebuild
deleted file mode 100644
index 67437cea5b1d..000000000000
--- a/dev-python/botocore/botocore-1.21.53.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-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 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${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
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.21.60.ebuild b/dev-python/botocore/botocore-1.21.60.ebuild
deleted file mode 100644
index 638620b2cbc8..000000000000
--- a/dev-python/botocore/botocore-1.21.60.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${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
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.21.65.ebuild b/dev-python/botocore/botocore-1.21.65.ebuild
deleted file mode 100644
index 638620b2cbc8..000000000000
--- a/dev-python/botocore/botocore-1.21.65.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${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
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.22.12.ebuild b/dev-python/botocore/botocore-1.22.12.ebuild
index 638620b2cbc8..67437cea5b1d 100644
--- a/dev-python/botocore/botocore-1.22.12.ebuild
+++ b/dev-python/botocore/botocore-1.22.12.ebuild
@@ -16,7 +16,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 RDEPEND="
diff --git a/dev-python/botocore/botocore-1.22.5.ebuild b/dev-python/botocore/botocore-1.22.5.ebuild
deleted file mode 100644
index 638620b2cbc8..000000000000
--- a/dev-python/botocore/botocore-1.22.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-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 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${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
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	epytest tests/{functional,unit}
-}
diff --git a/dev-python/botocore/botocore-1.23.1.ebuild b/dev-python/botocore/botocore-1.23.14.ebuild
index 7337877443c9..80a198d56414 100644
--- a/dev-python/botocore/botocore-1.23.1.ebuild
+++ b/dev-python/botocore/botocore-1.23.14.ebuild
@@ -60,5 +60,6 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
+	distutils_install_for_testing --via-venv
 	epytest tests/{functional,unit}
 }
diff --git a/dev-python/botocore/botocore-1.23.2.ebuild b/dev-python/botocore/botocore-1.23.15.ebuild
index 7337877443c9..80a198d56414 100644
--- a/dev-python/botocore/botocore-1.23.2.ebuild
+++ b/dev-python/botocore/botocore-1.23.15.ebuild
@@ -60,5 +60,6 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
+	distutils_install_for_testing --via-venv
 	epytest tests/{functional,unit}
 }
diff --git a/dev-python/botocore/botocore-1.23.3.ebuild b/dev-python/botocore/botocore-1.23.17.ebuild
index 7337877443c9..80a198d56414 100644
--- a/dev-python/botocore/botocore-1.23.3.ebuild
+++ b/dev-python/botocore/botocore-1.23.17.ebuild
@@ -60,5 +60,6 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
+	distutils_install_for_testing --via-venv
 	epytest tests/{functional,unit}
 }
diff --git a/dev-python/botocore/botocore-1.23.4.ebuild b/dev-python/botocore/botocore-1.23.18.ebuild
index 7337877443c9..80a198d56414 100644
--- a/dev-python/botocore/botocore-1.23.4.ebuild
+++ b/dev-python/botocore/botocore-1.23.18.ebuild
@@ -60,5 +60,6 @@ python_test() {
 		tests/functional/test_six_threading.py::test_six_thread_safety
 	)
 
+	distutils_install_for_testing --via-venv
 	epytest tests/{functional,unit}
 }
diff --git a/dev-python/botocore/botocore-1.23.19.ebuild b/dev-python/botocore/botocore-1.23.19.ebuild
new file mode 100644
index 000000000000..80a198d56414
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.19.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${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
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-1.23.20.ebuild b/dev-python/botocore/botocore-1.23.20.ebuild
new file mode 100644
index 000000000000..80a198d56414
--- /dev/null
+++ b/dev-python/botocore/botocore-1.23.20.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${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
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest tests/{functional,unit}
+}
diff --git a/dev-python/botocore/botocore-9999.ebuild b/dev-python/botocore/botocore-9999.ebuild
index 638620b2cbc8..80a198d56414 100644
--- a/dev-python/botocore/botocore-9999.ebuild
+++ b/dev-python/botocore/botocore-9999.ebuild
@@ -42,9 +42,24 @@ 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
+	)
+
+	distutils_install_for_testing --via-venv
 	epytest tests/{functional,unit}
 }