Adding metadata

33 files changed, 385 insertions, 421 deletions

diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3e66820654ca..985cffa4d3e3 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -17,4 +17,5 @@ DIST boto3-1.17.30.tar.gz 351634 BLAKE2B e6ad4b4e09ae45684ccd799da45dcf7844149b3
 DIST boto3-1.17.31.tar.gz 352268 BLAKE2B eefb7bcc3c6809fc03de2f175d5c3cfa750bc8650d56d5ee18608077a88a1c09ea79c2de1ce67f7d48129d5c948a7e5e30ab261c55a381ccf5c030dc42ff0ee0 SHA512 2d603a307575ff04877105ac98068d96b676faaa89b73ef470d9341951d5fcc148a57c7e80867d93bf257854ec700f61e48575ceebe19591091bbf2a68701138
 DIST boto3-1.17.32.tar.gz 352337 BLAKE2B 0d453ecd51d17291f10d2ffa4ae7b1036dced70a5ca0eafdc5f3073829942ecde57fe20f4d0139bfb2f75bdc47a000624281258ff621b98683ea41eae1a4bc71 SHA512 1bf61e3fcd2d650a534de5e7ed471bbdfeb2be6771f1dbde057ea2e3f3b6a29d6022011b5df90bae5c7ff231aec63ec49501cc3bd42421ec510d73e712060aad
 DIST boto3-1.17.33.tar.gz 352659 BLAKE2B b78e3ce86b32d23ade26d93d0c3ba86020a94becb42a866be6ee02f268819eb78fde398b4bd3125c5be6b493b28434c448411b9bd83eb631a3687019aa384ae0 SHA512 452cb1d165afe03a7603999033348524212d62742a026bc51677f5b64e9de98be2920c89f7aaf5999dd676c0c9ff098af055edc01edd97bad239815263ffbd38
+DIST boto3-1.17.34.tar.gz 353010 BLAKE2B a50c6a7d5fa6cf0336fe69d5a78d3dd5b651f6b475ec34bdb3242a3efc0614d567e6dbed1029f7b0483c9b699b30c9c42a676b23671677f1ee89ecbbf06e10f8 SHA512 f1b79b1b626aaa25631f3d99f44a15b2862face3aedff273910f43d44c04bd4211aff240d8f3231280170c5403b75e0058f4a466bdc9d9fb8ce044f32eb998ab
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
diff --git a/dev-python/boto3/boto3-1.17.34.ebuild b/dev-python/boto3/boto3-1.17.34.ebuild
new file mode 100644
index 000000000000..2df16964cdb0
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.34.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 0048fc650615..51b8546efb2b 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -17,4 +17,5 @@ DIST botocore-1.20.30.tar.gz 7534280 BLAKE2B bfa6066e8e2c28475807b8a469257cc8fc6
 DIST botocore-1.20.31.tar.gz 7544090 BLAKE2B c8c158f69463e2eaf3c817d7577bd449724bf0a409e65bd83734cb7af3c0211999e4f7d240da97f017829ee04cbd4f69af0e7ea589adcfb413498dfd831630c9 SHA512 a7f8c02b4518a25e1eb0299b3cec5791810e81b7b6b1d8c9ef2e94cd9fcba21bdcdfc3fe96955e134fc0acb78e27aff850ee352a718d2bf518c8480287a1eb26
 DIST botocore-1.20.32.tar.gz 7543258 BLAKE2B 464b1b32d32f25874cf73a57c281436a6c6095d69dbd90ac6566fbfacb58fea4162e61d58092708c243917398fb9c1898feb3ed7903515a0a2f24c6cf16278d3 SHA512 e7a7a1fac7fab4e6ec49e38909c306ed7f54b544ebe85cefb0a743aa44882707b51877d4872926be282117ecfeeef564f1345b2be8daed9cd54dcd970d5d6811
 DIST botocore-1.20.33.tar.gz 7543656 BLAKE2B eefd7b06c5a43780982616cfd640c6a1c5d9e919b403c0f78be06833e8e618b142cabacf2dd3b3e13cf351bbd5d0d42ef23b314355f68f7d9dc6aa9cae6e377f SHA512 6354ed7ebbe467ea96c0ea0e059acd2be0a40973d55998c0e006e73a67f2a69bd8009099f761af83e47022ad27698d3a21ffc2824ad4b74a687bc490239420e0
+DIST botocore-1.20.34.tar.gz 7545620 BLAKE2B 49f44aa2b4799ddf03adeb48790bcf23744a13e61cc1a64be67bfadf54a51213b99ae4cf26cdfc948482b7ffeff391a06f34eb4628bf2cbf6d8af1adb78f1932 SHA512 b85878eb36507687171136fd6d8b2d00a9a9fe0123d36b42906026ff3bad3580b0e6e6e8ee50c35f14a237acf9f354c6ecdfe38b14cce83fd65fa6873aa25d84
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
diff --git a/dev-python/botocore/botocore-1.20.34.ebuild b/dev-python/botocore/botocore-1.20.34.ebuild
new file mode 100644
index 000000000000..9d681f87244c
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.34.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,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 ~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/mock[${PYTHON_USEDEP}]
+		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 nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/brotlicffi/Manifest b/dev-python/brotlicffi/Manifest
index 58c38dd88d8b..7f031b2bfc61 100644
--- a/dev-python/brotlicffi/Manifest
+++ b/dev-python/brotlicffi/Manifest
@@ -1,3 +1,2 @@
 DIST brotli-46c1a881b41bb638c76247558aa04b1591af3aa7.tar.gz 19840371 BLAKE2B b9a1c3c2e5b62bd63b392debe54bd1732ac1cb31f88500f0142108b453649d96901d9a03b6db98642cb9abaf9188c06d440f2b8bd3cf57fbbb52196a931f5079 SHA512 dc573c90491032a205f32f0ce9c93e95b06c70a3107caa9501e038a212226c37117d63709a29843367344bf7d18cf32d0c0578b11166387198e12b38b1522406
-DIST brotlicffi-0.8.0.gh.tar.gz 21997 BLAKE2B 5e817e228ce01cd7a831c59cca5bab3e851d676f1daa5efab8f61a203c0854bcc92605c88896dff5f4ce27fc880718da5ddfcf02a3bddbbd7b2e18c33f1e77a4 SHA512 fd0c64b400d3b48e0e2d113b4d75e32a2b33fd99505c7661d6d51ba9aedf5cc1f58be09bc90a5f1f7e3424addef2b54cc085a41e6291c87d53dd7d4e8fc7eb4e
 DIST brotlicffi-1.0.9.1.gh.tar.gz 22589 BLAKE2B 14ebb3f6168d334abe3ba72bd88697ee98aba87ace6aaf634395ef50ecd9325723f0da0a9ce56a5e4dcfebfe3183a190e2ec183eff95492b25e3542161b32322 SHA512 669c73ed6dd18be6b916bb8cfb240657dcc10d67df5a32b3359f05cadf75aa654c27b53e8b964251f6d6cd74870e159efddf87ef0cfb59b7777eacd3cda66852
diff --git a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild b/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
deleted file mode 100644
index 4d4377eff533..000000000000
--- a/dev-python/brotlicffi/brotlicffi-0.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
-
-inherit distutils-r1
-
-# Commit of the Brotli library bundled within brotlipy.
-BROTLI_BUNDLED_COMMIT="46c1a881b41bb638c76247558aa04b1591af3aa7"
-
-DESCRIPTION="Python binding to the Brotli library"
-HOMEPAGE="
-	https://github.com/python-hyper/brotlicffi/
-	https://pypi.org/project/brotlicffi/"
-SRC_URI="
-	https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	test? (
-		https://github.com/google/brotli/archive/${BROTLI_BUNDLED_COMMIT}.tar.gz
-			-> brotli-${BROTLI_BUNDLED_COMMIT}.tar.gz
-	)"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	app-arch/brotli:=
-	virtual/python-cffi[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	# remove custom dictionary code that isn't supported by new brotli
-	"${FILESDIR}"/brotlicffi-0.8.0-remove-dict.patch
-)
-
-src_unpack() {
-	default
-	if use test; then
-		mv "brotli-${BROTLI_BUNDLED_COMMIT}"/tests "${S}"/libbrotli/ || die
-	fi
-}
-
-src_configure() {
-	export USE_SHARED_BROTLI=1
-}
diff --git a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
index 41becb109c84..b4735ef4f0e0 100644
--- a/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
+++ b/dev-python/brotlicffi/brotlicffi-1.0.9.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-arch/brotli:=
diff --git a/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch b/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
deleted file mode 100644
index bfb1b61b951b..000000000000
--- a/dev-python/brotlicffi/files/brotlicffi-0.8.0-remove-dict.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 0fe3dc70240ea62b56861ab830f9ab44644b18e5 Mon Sep 17 00:00:00 2001
-From: Seth Michael Larson <sethmichaellarson@gmail.com>
-Date: Sat, 28 Nov 2020 14:36:59 -0600
-Subject: [PATCH] Update libbrotli to 1.0.9
-
-(stripped down to removing custom dictionary support)
-
----
- src/brotlicffi/_api.py          | 21 ++----------
- src/brotlicffi/_build.py        | 25 +-------------
- test/test_simple_compression.py |  8 -----
-
-diff --git a/src/brotlicffi/_api.py b/src/brotlicffi/_api.py
-index 49da0a3..8358d3f 100644
---- a/src/brotlicffi/_api.py
-+++ b/src/brotlicffi/_api.py
-@@ -95,8 +95,7 @@ def compress(data,
-              mode=DEFAULT_MODE,
-              quality=lib.BROTLI_DEFAULT_QUALITY,
-              lgwin=lib.BROTLI_DEFAULT_WINDOW,
--             lgblock=0,
--             dictionary=b''):
-+             lgblock=0):
-     """
-     Compress a string using Brotli.
- 
-@@ -124,11 +123,6 @@ def compress(data,
-         based on ``quality``.
-     :type lgblock: ``int``
- 
--    :param dictionary: A pre-set dictionary for LZ77. Please use this with
--        caution: if a dictionary is used for compression, the same dictionary
--        **must** be used for decompression!
--    :type dictionary: ``bytes``
--
-     :returns: The compressed bytestring.
-     :rtype: ``bytes``
-     """
-@@ -141,8 +135,7 @@ def compress(data,
-         mode=mode,
-         quality=quality,
-         lgwin=lgwin,
--        lgblock=lgblock,
--        dictionary=dictionary
-+        lgblock=lgblock
-     )
-     compressed_data = compressor._compress(data, lib.BROTLI_OPERATION_FINISH)
-     assert lib.BrotliEncoderIsFinished(compressor._encoder) == lib.BROTLI_TRUE
-@@ -255,8 +248,7 @@ def __init__(self,
-                  mode=DEFAULT_MODE,
-                  quality=lib.BROTLI_DEFAULT_QUALITY,
-                  lgwin=lib.BROTLI_DEFAULT_WINDOW,
--                 lgblock=0,
--                 dictionary=b''):
-+                 lgblock=0):
-         enc = lib.BrotliEncoderCreateInstance(
-             ffi.NULL, ffi.NULL, ffi.NULL
-         )
-@@ -271,13 +263,6 @@ def __init__(self,
-         _set_parameter(enc, lib.BROTLI_PARAM_LGWIN, "lgwin", lgwin)
-         _set_parameter(enc, lib.BROTLI_PARAM_LGBLOCK, "lgblock", lgblock)
- 
--        if dictionary:
--            self._dictionary = ffi.new("uint8_t []", dictionary)
--            self._dictionary_size = len(dictionary)
--            lib.BrotliEncoderSetCustomDictionary(
--                enc, self._dictionary_size, self._dictionary
--            )
--
-         self._encoder = enc
- 
-     def _compress(self, data, operation):
-diff --git a/src/brotlicffi/_build.py b/src/brotlicffi/_build.py
-index d2a2d85..45dccb6 100644
---- a/src/brotlicffi/_build.py
-+++ b/src/brotlicffi/_build.py
-@@ -93,20 +93,6 @@
-                                                       uint8_t** next_out,
-                                                       size_t* total_out);
- 
--    /* Fills the new state with a dictionary for LZ77, warming up the
--       ringbuffer, e.g. for custom static dictionaries for data formats.
--       Not to be confused with the built-in transformable dictionary of Brotli.
--       |size| should be less or equal to 2^24 (16MiB), otherwise the dictionary
--       will be ignored. The dictionary must exist in memory until decoding is
--       done and is owned by the caller. To use:
--        1) Allocate and initialize state with BrotliCreateInstance
--        2) Use BrotliSetCustomDictionary
--        3) Use BrotliDecompressStream
--        4) Clean up and free state with BrotliDestroyState
--    */
--    void BrotliDecoderSetCustomDictionary(
--        BrotliDecoderState* s, size_t size, const uint8_t* dict);
--
-     /* Returns true, if decoder has some unconsumed output.
-        Otherwise returns false. */
-     BROTLI_BOOL BrotliDecoderHasMoreOutput(const BrotliDecoderState* s);
-@@ -205,15 +191,6 @@
-                                           BrotliEncoderParameter p,
-                                           uint32_t value);
- 
--    /* Fills the new state with a dictionary for LZ77, warming up the
--       ringbuffer, e.g. for custom static dictionaries for data formats.
--       Not to be confused with the built-in transformable dictionary of Brotli.
--       To decode, use BrotliSetCustomDictionary() of the decoder with the same
--       dictionary. */
--    void BrotliEncoderSetCustomDictionary(BrotliEncoderState* state,
--                                          size_t size,
--                                          const uint8_t* dict);
--
-     /* Check if encoder is in "finished" state, i.e. no more input is
-        acceptable and no more output will be produced.
-        Works only with BrotliEncoderCompressStream workflow.
-diff --git a/test/test_simple_compression.py b/test/test_simple_compression.py
-index 45c322d..a480587 100644
---- a/test/test_simple_compression.py
-+++ b/test/test_simple_compression.py
-@@ -110,14 +110,6 @@ def test_compressed_data_roundtrips(s):
-     assert brotlicffi.decompress(brotlicffi.compress(s)) == s
- 
- 
--@given(binary(), binary())
--def test_compressed_data_with_dictionaries(s, dictionary):
--    d = brotlicffi.Decompressor(dictionary)
--    compressed = brotlicffi.compress(s, dictionary=dictionary)
--    uncompressed = d.decompress(compressed)
--    assert uncompressed == s
--
--
- @given(binary())
- def test_process_alias(s):
-     c1 = brotlicffi.Compressor()
diff --git a/dev-python/cffi/cffi-1.14.5.ebuild b/dev-python/cffi/cffi-1.14.5.ebuild
index fe8298fe05b7..12eca410929e 100644
--- a/dev-python/cffi/cffi-1.14.5.ebuild
+++ b/dev-python/cffi/cffi-1.14.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index f988d1b502ba..2c236685b92b 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,3 +1,4 @@
 DIST cfn-python-lint-0.44.7.tar.gz 5711448 BLAKE2B b38b90ca7d181dc655b07a0151acad6a22ed1a0d34223cb813c3257cceb0f9ef5ca175cd4992a9d72a843c2b40b0830c433cbbe8b71550c9c9c482ea62783142 SHA512 a4ed91383f80e437338f7afee55de5e7cb0f3f8690c4324de77f2d35a665e5947f07945449aedddbd9d996270495ee63418e38b97639c4b7852b1fe50e8ce6e4
 DIST cfn-python-lint-0.46.0.tar.gz 6287874 BLAKE2B 7ec2665596b50697c95e32b40f736822d718d4682d3a41f72b94e45f1b42a386d2d44cb5447826010c01ccd8da655e394b7379764e5e8ca2a79db22c274cc033 SHA512 b87751a719fc037dca2533bb8e14a483bc85d4460b73c7ef2a2d2fff188bd1c611d9828dbf13eca16781e21124123a85c723054bc460243df8ee9fcba5d8e104
 DIST cfn-python-lint-0.47.2.tar.gz 6478541 BLAKE2B 1955c6aa43512d4249741db982a6e4e5fe46daa3197d028590269d74690de2f67a1615e4907bfc434fb1e265770780a5c0da2a19c2bdfa8b44dfc7b0386e4405 SHA512 26e2e4cc26090e6da54ff0f90b9e35767e1d5677321cfb84ff00f820477d6ab576e7f58219346f48eb838dccf662df3a8a75e709cfa9690868d85130745f0cc8
+DIST cfn-python-lint-0.48.0.tar.gz 6528354 BLAKE2B 083f154f04c301dda2e84bbfdbf82f84f38516b865e085b16c9d4acdaff47849dd143cdbd7c26dbfca44608d9a402a16ecf627c8a89c01a69e1a9980d1b1ea61 SHA512 2df97e731c01d9cfe5d85dbed9bb03e487bbb86b293187f8ae66022cc2b7f85916397bcbb1b67ab179136599e4204fd058ba37d0f69f0d1c5605e34d8e56e4ce
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild
new file mode 100644
index 000000000000..fbf7b8c88b2b
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.48.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/colorlog/Manifest b/dev-python/colorlog/Manifest
index b07536dde92b..0874aa1ffd83 100644
--- a/dev-python/colorlog/Manifest
+++ b/dev-python/colorlog/Manifest
@@ -1 +1,2 @@
 DIST colorlog-4.7.2.tar.gz 28764 BLAKE2B 35cfba0aa03879786a41eb09601f0b4227c5fbaca91f560810e4a4626d9b3a15b8072df06315f81739d27b410c587a062132d5315bd1e0db059baecf757709d7 SHA512 103640e0a4bff6bd81d26c1019fe954f52870947c0b68b3b2a85f178c8f50040e3eeafe08b2a25aa130433c1c8f144b722e4f3795fcbcc0ed4c2386cee626884
+DIST colorlog-4.8.0.tar.gz 28770 BLAKE2B ea4d955c7b60651731547d27b35a09fe93e33feb51f007c622be4fd2611a706befc9565d51b17af4ae2a97d96bf7d9177b834a1bf302a50a2cbb9822134a696f SHA512 b335df74e4b10acd835e3f301c8ed9e77bd42b964a6b890682f28ff50f9302143805591ba80d567725b90df6a01601aab7fac89a8a71a119d6dff6f6bf94b1ad
diff --git a/dev-python/colorlog/colorlog-4.8.0.ebuild b/dev-python/colorlog/colorlog-4.8.0.ebuild
new file mode 100644
index 000000000000..486cf17e0ba0
--- /dev/null
+++ b/dev-python/colorlog/colorlog-4.8.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Log formatting with colors"
+HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mox3/Manifest b/dev-python/mox3/Manifest
deleted file mode 100644
index 54506f3d103c..000000000000
--- a/dev-python/mox3/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mox3-0.24.0.tar.gz 44846 BLAKE2B dd1a27b20fc821de79f1e1f209872c3fb66f39b2330d1dda04c5b17045e337c84920e4538d7971f025d1377f9e91abd2fca8167508c5614fee06d9fca92aaa75 SHA512 6c081cf2b1e529f3213f7f48d22ed5d2980420b2de8f49607b624d5861f8b784f2f36d8a32fae3e81fe8186c1a9c36e6c4ec7d9de172c41c0530523590ef97b6
diff --git a/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch b/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
deleted file mode 100644
index 8c118e6a9ca1..000000000000
--- a/dev-python/mox3/files/mox3-0.12.0-RegexTest-python3.6.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Zac Medico <zmedico@gentoo.org>
-Subject: [PATCH] RegexTest: python3.6 compatibility
-
-https://bugs.launchpad.net/python-mox3/+bug/1665266
-
---- mox3-0.12.0/mox3/tests/test_mox.py
-+++ mox3-0.12.0/mox3/tests/test_mox.py
-@@ -316,8 +316,8 @@
- 
-     def testReprWithFlags(self):
-         """repr should return the regular expression pattern and flags."""
--        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=4)) ==
--                        "<regular expression 'a\s+b', flags=4>")
-+        self.assertTrue(repr(mox.Regex(r"a\s+b", flags=8)) ==
-+                        r"<regular expression 'a\s+b', flags=8>")
- 
- 
- class IsTest(testtools.TestCase):
diff --git a/dev-python/mox3/metadata.xml b/dev-python/mox3/metadata.xml
deleted file mode 100644
index 8d7c9eb63a29..000000000000
--- a/dev-python/mox3/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>openstack@gentoo.org</email>
-  <name>Openstack</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">mox3</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/mox3/mox3-0.24.0.ebuild b/dev-python/mox3/mox3-0.24.0.ebuild
deleted file mode 100644
index b85e6a548556..000000000000
--- a/dev-python/mox3/mox3-0.24.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock object framework for Python"
-HOMEPAGE="https://www.openstack.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-CRDEPEND=">=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		${CRDEPEND}
-		>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	${CRDEPEND}
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12.0-RegexTest-python3.6.patch )
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/nosexcover/Manifest b/dev-python/nosexcover/Manifest
deleted file mode 100644
index 90bda662ebdf..000000000000
--- a/dev-python/nosexcover/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nosexcover-1.0.11.tar.gz 2903 BLAKE2B 297dc37504e2db992600ee4ec7c6c2cabdb36d8e137298755bdc6fe4af8dba666e99975a894ee534de62b4576514a3d912e6b98bcb43f228db9b58849788c092 SHA512 a4c75aac5095aa8323094b2a4eceb3af26243e6c87dd8720df8cf43ae0f76c28c638fe2c3cbcad621b7c2779115dccbb32e6a2f33a8bc5efb22a0fb0901d64fa
diff --git a/dev-python/nosexcover/metadata.xml b/dev-python/nosexcover/metadata.xml
deleted file mode 100644
index a7402816dae6..000000000000
--- a/dev-python/nosexcover/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
-  <email>python@gentoo.org</email>
-  <name>Python</name>
- </maintainer>
- <maintainer type="project">
-  <email>openstack@gentoo.org</email>
-  <name>Openstack</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">nosexcover</remote-id>
-  <remote-id type="github">cmheisel/nose-xcover</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild b/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
deleted file mode 100644
index e7cc5da20300..000000000000
--- a/dev-python/nosexcover/nosexcover-1.0.11-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-DESCRIPTION="Extends nose.plugins.cover to add Cobertura-style XML reports"
-HOMEPAGE="https://github.com/cmheisel/nose-xcover/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-RDEPEND="
-	dev-python/nose[${PYTHON_USEDEP}]
-	>=dev-python/coverage-3.4[${PYTHON_USEDEP}]"
-
-python_test() {
-	nosetests -v nosexcover/tests.py || die
-}
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 9651db14043f..3cc163ca0354 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1 +1,2 @@
 DIST notebook-6.2.0.tar.gz 13927515 BLAKE2B ca752f0cb316b46b71d8451c59c196c324008c296dfc7fbc4ee426ba5b3c1035e90170e46720547a9e3f2cf381ab5e0294185ee1a814d31ffbe6ecf546f229d6 SHA512 217392000ca2d0266137f937fc4d2a1b81ed19217fdbf6550b07453eede8b9a6e15c8fbb1c94f559a7f44ac73dfadcefeae815c186e56bb1e9a30120fe070f3a
+DIST notebook-6.3.0.tar.gz 13922153 BLAKE2B f24b03d4887b1e786da215a4ab10d83e4ae8391d1b88559f4bb35fcf7813d98e487447bf21a1772d502d6b3594c53e6e7b743b681cdb07b5118cc4808bcd02a4 SHA512 112bb0b176f7e6584ca0f09d74cb34fe756d0491320dcc23932f84236fd55b9f56f13a7057c89be073486637fc8c0cf2c44dfce18f27fa16ad0f9d15d2bcd5be
diff --git a/dev-python/notebook/notebook-6.3.0.ebuild b/dev-python/notebook/notebook-6.3.0.ebuild
new file mode 100644
index 000000000000..447a3fbd4582
--- /dev/null
+++ b/dev-python/notebook/notebook-6.3.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/Manifest b/dev-python/os-diskconfig-python-novaclient-ext/Manifest
deleted file mode 100644
index 0b74b0afe5e1..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST os_diskconfig_python_novaclient_ext-0.1.3.tar.gz 2543 BLAKE2B 07fb502eaa1fa4340c2adff63e5ecbea17292bf7a7c69171507be83b51e9fe65870b0716cdc857d49fe31d01a6522cd265950a7ccf9487599cc19dd0c808ca55 SHA512 4733c4ef720d0fdfabaa26c4288b933ac7d9e4433b20257cfe206399b71154dc6ee98ab621e67aa4c3446df2ec1929edfb9341538d7d4ab69d71576652a9d591
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml b/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
deleted file mode 100644
index fca1ee088557..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-  <name>Matthew Thode</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">os_diskconfig_python_novaclient_ext</remote-id>
-  <remote-id type="github">rackerlabs/os_diskconfig_python_novaclient_ext</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
deleted file mode 100644
index 2a76625de79e..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-0.1.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Disk Config extension for python-novaclient"
-HOMEPAGE="https://github.com/rackerlabs/os_diskconfig_python_novaclient_ext"
-SRC_URI="mirror://pypi/${PN:0:1}/os_diskconfig_python_novaclient_ext/os_diskconfig_python_novaclient_ext-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN//-/_}-${PV}"
diff --git a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild b/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
deleted file mode 100644
index 58a018cc477d..000000000000
--- a/dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-
-inherit distutils-r1 git-r3
-
-EGIT_REPO_URI="https://github.com/rackerlabs/os_diskconfig_python_novaclient_ext.git"
-
-DESCRIPTION="Disk Config extension for python-novaclient"
-HOMEPAGE="https://github.com/rackerlabs/os_diskconfig_python_novaclient_ext"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/python-novaclient-2.10.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-sphinx/Manifest b/dev-python/oslo-sphinx/Manifest
deleted file mode 100644
index e048049c9d77..000000000000
--- a/dev-python/oslo-sphinx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST oslosphinx-4.18.0.tar.gz 32046 BLAKE2B b10b13f819cc2f4c3e769c195bc340a74545a4cab2a2e9894e56e4352f5f35c1cdd7f1d40d47c2b7449d30bc77dbadb1feae129f6ff31d54e6227349a0c31e57 SHA512 b736dbf68a3ad8c32ca6d8de72cb79e49ab4b84593c70d0165615de66a8c343ce7094656d3b0be3383453143308a4862f27529b1c9d72920c5418a3f62dbcc46
diff --git a/dev-python/oslo-sphinx/metadata.xml b/dev-python/oslo-sphinx/metadata.xml
deleted file mode 100644
index 4564827bc7c8..000000000000
--- a/dev-python/oslo-sphinx/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-  <name>Matthew Thode</name>
- </maintainer>
- <maintainer type="project">
-  <email>openstack@gentoo.org</email>
-  <name>Openstack</name>
- </maintainer>
- <upstream>
-  <remote-id type="pypi">oslosphinx</remote-id>
- </upstream>
- <origin>gentoo-staging</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
deleted file mode 100644
index 6a88d45df6eb..000000000000
--- a/dev-python/oslo-sphinx/oslo-sphinx-4.18.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit distutils-r1
-
-MY_PN="${PN//-/}"
-
-DESCRIPTION="OpenStack Sphinx Extensions and Theme"
-HOMEPAGE="https://www.openstack.org/"
-S="${WORKDIR}/${MY_PN}-${PV}"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc x86"
-
-BDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-RDEPEND="
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 36a270dc1d9f..86c6c516f2de 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,2 +1,3 @@
 DIST prompt_toolkit-3.0.16.tar.gz 3033157 BLAKE2B 6f21544701f956a1e9ec29d049750dc47a6e3861e33a0ccc1e407185ece967c692d3f868e670779dadef3cdf5ec72bd6477e1b3ebfeddd84c267db94efa33f22 SHA512 fd8ebf4ceb61fb823a13bf81ebd6864e817541d08d0744eec8968afe9a9d44bfa95031fe7c53accc81a1612253041e742957aee3718dd18c437d8c3e1b616f35
 DIST prompt_toolkit-3.0.17.tar.gz 3033301 BLAKE2B 86ba94f2e0c9e998c53e5e4ed12961c85c667b6d0356d17cfcb1856aef933f88c1c525507e76a833970444a787641c7316bc7496787ffcd61102945ae91b73bb SHA512 ef78b3aaf953f20a035f8a1f58262a8e4c1ae6b88c02c523bc51237bed22f52e229488d0113901bcd94835cc7120ccb4beb75cc9c9d99dde4e8f21df7bfde8a4
+DIST prompt_toolkit-3.0.18.tar.gz 3034754 BLAKE2B 27334b7009fc162af67a1fa14bd30c76efed6a333c5c93f3100a2c9ad3299a1139c3c3cf530e7e048b5700c0dc4ec1087d1aecd5412785b09221ea2d55796008 SHA512 be2dbd72a1e08553c0e50453958b6085a7d743464acd02b303e5002e1174d672d2cadd7a992e71d0445aa2f2be7565411ae4d00c3677c275eca056a20ad9efc8
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild
new file mode 100644
index 000000000000..46cd3eff785d
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.18.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="
+	https://pypi.org/project/prompt-toolkit/
+	https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 0437871e994e..3ab3aae592fb 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -2,3 +2,4 @@ DIST setuptools-53.0.0.tar.gz 2050503 BLAKE2B b1ebe5a9776917fe9a21a13a4db613fd05
 DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
 DIST setuptools-54.1.1.tar.gz 2053415 BLAKE2B 59d60e9be5a184e34e8c9e1ccb477eae538836c8fac4862f3365e1abe8beec6cc85490918d413b29831c4d3738ca19cd84ac4a9d30178e45e42c652a0ade5fac SHA512 d2ab5445a9b4de5b5fae8aab6a47131ad41a011fa23fb1e6c07a599bcb27a8f89ea3c5ea9939577d6286bf3f8e2edf0334816ae1a507dba09c46435d063c3379
 DIST setuptools-54.1.2.tar.gz 2053508 BLAKE2B 23958ab6bc8ac5681fb4a86217b893f5389be1afc9e71f77a3aaaca469e3f86117e55f9df8f864ae56059ef6aef054a6a5ce8d6670a5ce266de6322b820e68d7 SHA512 b6efe6e92227704a95d4d4a31d033df6df96a430d7e51cb7df80203af56d8f8f64c95deaf194c7cfbfd2111f5bc02be45db2c0383c3209c898c1858821eb4642
+DIST setuptools-54.2.0.tar.gz 2054279 BLAKE2B 2a52e76808fb2bc6df4c59ac7476a9386401180ff6c0d52a5f3d87aedf976a3057cfa0a7ddf2a4497c4c1552d5ebe4810c4bbfa127e1293f950054bddbf7d835 SHA512 b18cd075cf59b8648611eef1874de41199ede6ffe6d7f5047586c6ac8783fe18b9a4f537783e590e7aec127033f612b93925e92f039bd6416a609fcfb262e354
diff --git a/dev-python/setuptools/setuptools-54.2.0.ebuild b/dev-python/setuptools/setuptools-54.2.0.ebuild
new file mode 100644
index 000000000000..2254172f079a
--- /dev/null
+++ b/dev-python/setuptools/setuptools-54.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9,10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}