Adding metadata

51 files changed, 199 insertions, 64 deletions

diff --git a/dev-python/aiohttp/metadata.xml b/dev-python/aiohttp/metadata.xml
index 56e92a8501ff..9d0cf9beb67f 100644
--- a/dev-python/aiohttp/metadata.xml
+++ b/dev-python/aiohttp/metadata.xml
@@ -12,6 +12,7 @@
  <upstream>
   <remote-id type="pypi">aiohttp</remote-id>
   <remote-id type="github">aio-libs/aiohttp</remote-id>
+  <remote-id type="cpe">cpe:/a:aiohttp_project:aiohttp</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/bleach/metadata.xml b/dev-python/bleach/metadata.xml
index 4cd71e8f2ecb..a21f9a74418d 100644
--- a/dev-python/bleach/metadata.xml
+++ b/dev-python/bleach/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">bleach</remote-id>
   <remote-id type="github">mozilla/bleach</remote-id>
+  <remote-id type="cpe">cpe:/a:mozilla:bleach</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/bottle/metadata.xml b/dev-python/bottle/metadata.xml
index 62d92b538a32..3d2044a7a0ab 100644
--- a/dev-python/bottle/metadata.xml
+++ b/dev-python/bottle/metadata.xml
@@ -7,6 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">bottle</remote-id>
+  <remote-id type="cpe">cpe:/a:bottlepy:bottle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
index ebf9a6ea8bfb..bedf74e8cf78 100644
--- a/dev-python/cryptography/metadata.xml
+++ b/dev-python/cryptography/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">cryptography</remote-id>
   <remote-id type="github">pyca/cryptography</remote-id>
+  <remote-id type="cpe">cpe:/a:python-cryptography_project:python-cryptography</remote-id>
  </upstream>
  <use>
   <flag name="idna">enable support for the old, deprecated IDNA specification (RFC 3490)</flag>
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index 6843c29fa59f..3253c441d60e 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">Django</remote-id>
   <remote-id type="github">django/django</remote-id>
+  <remote-id type="cpe">cpe:/a:djangoproject:django</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/ecdsa/metadata.xml b/dev-python/ecdsa/metadata.xml
index a912f550fedb..bc884aa70d1e 100644
--- a/dev-python/ecdsa/metadata.xml
+++ b/dev-python/ecdsa/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">ecdsa</remote-id>
   <remote-id type="github">tlsfuzzer/python-ecdsa</remote-id>
+  <remote-id type="cpe">cpe:/a:python-ecdsa_project:python-ecdsa</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/flask-cors/metadata.xml b/dev-python/flask-cors/metadata.xml
index 03450d1a23b6..4382a7008a40 100644
--- a/dev-python/flask-cors/metadata.xml
+++ b/dev-python/flask-cors/metadata.xml
@@ -12,6 +12,7 @@
  <upstream>
   <remote-id type="pypi">Flask-Cors</remote-id>
   <remote-id type="github">wcdolphin/flask-cors</remote-id>
+  <remote-id type="cpe">cpe:/a:flask-cors_project:flask-cors</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/flask/metadata.xml b/dev-python/flask/metadata.xml
index 6042e946665f..bec9fd4cc969 100644
--- a/dev-python/flask/metadata.xml
+++ b/dev-python/flask/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">Flask</remote-id>
   <remote-id type="github">pallets/flask</remote-id>
+  <remote-id type="cpe">cpe:/a:palletsprojects:flask</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
index 24f4751d8236..6301143921d3 100644
--- a/dev-python/hpack/metadata.xml
+++ b/dev-python/hpack/metadata.xml
@@ -12,6 +12,7 @@
 	</longdescription>
  <upstream>
   <remote-id type="pypi">hpack</remote-id>
+  <remote-id type="cpe">cpe:/a:python:hpack</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/httplib2/metadata.xml b/dev-python/httplib2/metadata.xml
index 2a9d2d86a98a..3e70078e8140 100644
--- a/dev-python/httplib2/metadata.xml
+++ b/dev-python/httplib2/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">httplib2</remote-id>
   <remote-id type="github">httplib2/httplib2</remote-id>
+  <remote-id type="cpe">cpe:/a:httplib2_project:httplib2</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index a5d7c31df048..55db66339683 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,2 +1,3 @@
 DIST humanize-3.2.0.tar.gz 53976 BLAKE2B 2e9347418ffa103c6a66583136aa0c79bce669b48fcbc01bf482ba16659af14d4b4a88e78167e8013a8ede6467ed7b7f5eea8f46ed4234294a79b0c63fabd17c SHA512 448919e762e0ecc95f5a7158e0dd8bc028d173ee236be8e15fd0283741af037af1bcdc671ed83b0c16c1998dc0a70debf11cb1c349085530e458bc7aa2f6dde4
 DIST humanize-3.3.0.tar.gz 54639 BLAKE2B 7861a5e0403aa9ea047e39f9aa42fdfd7c7f38f295e93b9790f7fea3a86a57e33e65cb302165f1f962a46bf84238fc8b53b2e3e786eb1804b674dca97f959fae SHA512 a25bbaaa8cdd8fc0a7375637c19f91f892b33b8576e4c88b9adc431e976cb4f8937f1f98d71f442547626276c75cb6be445cac9b11b6504b6a444740df486faf
+DIST humanize-3.4.0.tar.gz 55440 BLAKE2B 78c5aa5c57002e64354c841500b1d4d10d32c60723c3f02aea092d4e8c0b31f2e18cdc2f0a66e8a9148fa723b35305efca3c0a517bd6206ab0adda18a74b7eeb SHA512 eb30378ca0b6dae838fd8f48d92f4d6a2de71537733a3863fdcd44cf915c4e200a3372fd1aa5c679d56638bc30e44fae29260a66358b4e77a61a63a51de5df58
diff --git a/dev-python/humanize/humanize-3.4.0.ebuild b/dev-python/humanize/humanize-3.4.0.ebuild
new file mode 100644
index 000000000000..b799aae188ae
--- /dev/null
+++ b/dev-python/humanize/humanize-3.4.0.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} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests --install pytest
diff --git a/dev-python/jsonpickle/metadata.xml b/dev-python/jsonpickle/metadata.xml
index 81f1a08913cf..fde577e84dc7 100644
--- a/dev-python/jsonpickle/metadata.xml
+++ b/dev-python/jsonpickle/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">jsonpickle</remote-id>
   <remote-id type="github">jsonpickle/jsonpickle</remote-id>
+  <remote-id type="cpe">cpe:/a:jsonpickle_project:jsonpickle</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/keyring/metadata.xml b/dev-python/keyring/metadata.xml
index ec22db3edade..f4dbbc98a555 100644
--- a/dev-python/keyring/metadata.xml
+++ b/dev-python/keyring/metadata.xml
@@ -16,6 +16,7 @@
  <upstream>
   <remote-id type="pypi">keyring</remote-id>
   <remote-id type="github">jaraco/keyring</remote-id>
+  <remote-id type="cpe">cpe:/a:python:keyring</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/lmdb/metadata.xml b/dev-python/lmdb/metadata.xml
index da6c3a45ce7a..31fadfa722ba 100644
--- a/dev-python/lmdb/metadata.xml
+++ b/dev-python/lmdb/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">lmdb</remote-id>
   <remote-id type="github">jnwatson/py-lmdb</remote-id>
+  <remote-id type="cpe">cpe:/a:py-lmdb_project:py-lmdb</remote-id>
   <doc>https://lmdb.readthedocs.io/</doc>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
index b44af449ab5f..f7644d7149b0 100644
--- a/dev-python/lxml/metadata.xml
+++ b/dev-python/lxml/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">lxml</remote-id>
   <remote-id type="github">lxml/lxml</remote-id>
+  <remote-id type="cpe">cpe:/a:lxml:lxml</remote-id>
   <bugs-to>https://bugs.launchpad.net/lxml</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/markdown2/metadata.xml b/dev-python/markdown2/metadata.xml
index 0fac08d06d01..9ca2e3cc6fef 100644
--- a/dev-python/markdown2/metadata.xml
+++ b/dev-python/markdown2/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">markdown2</remote-id>
   <remote-id type="github">trentm/python-markdown2</remote-id>
+  <remote-id type="cpe">cpe:/a:python-markdown2_project:python-markdown2</remote-id>
   <bugs-to>https://github.com/trentm/python-markdown2/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 7d9424f6e818..093ce55f4bf1 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -12,6 +12,7 @@
  <upstream>
   <remote-id type="pypi">notebook</remote-id>
   <remote-id type="github">jupyter/notebook</remote-id>
+  <remote-id type="cpe">cpe:/a:jupyter:notebook</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index c73ffa8ece0b..e8c1328671bf 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -7,6 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">openpyxl</remote-id>
+  <remote-id type="cpe">cpe:/a:python:openpyxl</remote-id>
   <changelog>https://openpyxl.readthedocs.io/en/stable/changes.html</changelog>
   <bugs-to>https://foss.heptapod.net/openpyxl/openpyxl/-/issues</bugs-to>
   <doc>https://openpyxl.readthedocs.io/</doc>
diff --git a/dev-python/pandas/metadata.xml b/dev-python/pandas/metadata.xml
index 75df03bf8a8b..36645b24496e 100644
--- a/dev-python/pandas/metadata.xml
+++ b/dev-python/pandas/metadata.xml
@@ -18,6 +18,7 @@
  <upstream>
   <remote-id type="pypi">pandas</remote-id>
   <remote-id type="github">pandas-dev/pandas</remote-id>
+  <remote-id type="cpe">cpe:/a:numfocus:pandas</remote-id>
  </upstream>
  <use>
   <flag name="full-support">Pull all packages to give pandas full support</flag>
diff --git a/dev-python/pikepdf/metadata.xml b/dev-python/pikepdf/metadata.xml
index b85167c0d227..f0c3dfdd14ab 100644
--- a/dev-python/pikepdf/metadata.xml
+++ b/dev-python/pikepdf/metadata.xml
@@ -16,6 +16,7 @@
  <upstream>
   <remote-id type="pypi">pikepdf</remote-id>
   <remote-id type="github">pikepdf/pikepdf</remote-id>
+  <remote-id type="cpe">cpe:/a:pikepdf_project:pikepdf</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml
index 26b18a01d795..8c70be3018a3 100644
--- a/dev-python/pillow/metadata.xml
+++ b/dev-python/pillow/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">Pillow</remote-id>
   <remote-id type="github">python-pillow/Pillow</remote-id>
+  <remote-id type="cpe">cpe:/a:python:pillow</remote-id>
  </upstream>
  <use>
   <flag name="imagequant">Build with Image Quantization Library support</flag>
diff --git a/dev-python/pip/metadata.xml b/dev-python/pip/metadata.xml
index 67cdae8ae813..4cb1994b585e 100644
--- a/dev-python/pip/metadata.xml
+++ b/dev-python/pip/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">pip</remote-id>
   <remote-id type="github">pypa/pip</remote-id>
+  <remote-id type="cpe">cpe:/a:pypa:pip</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/pockets/pockets-0.9.1.ebuild b/dev-python/pockets/pockets-0.9.1.ebuild
deleted file mode 100644
index 51335ac0ac3c..000000000000
--- a/dev-python/pockets/pockets-0.9.1.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="Collection of helpful Python tools"
-HOMEPAGE="https://pypi.org/project/pockets/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/py/metadata.xml b/dev-python/py/metadata.xml
index e784eacbeda8..ac8422e56d7f 100644
--- a/dev-python/py/metadata.xml
+++ b/dev-python/py/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">py</remote-id>
   <remote-id type="github">pytest-dev/py</remote-id>
+  <remote-id type="cpe">cpe:/a:pytest:py</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/pycryptodome/metadata.xml b/dev-python/pycryptodome/metadata.xml
index 755058b6bab9..f83fab86088a 100644
--- a/dev-python/pycryptodome/metadata.xml
+++ b/dev-python/pycryptodome/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="github">Legrandin/pycryptodome</remote-id>
   <remote-id type="pypi">pycryptodome</remote-id>
+  <remote-id type="cpe">cpe:/a:python:pycryptodome</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index 4aaf8a1bb7ed..75ff3e3260df 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -9,6 +9,7 @@
  <upstream>
   <remote-id type="pypi">Pygments</remote-id>
   <remote-id type="github">pygments/pygments</remote-id>
+  <remote-id type="cpe">cpe:/a:pygments:pygments</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/pymediainfo/Manifest b/dev-python/pymediainfo/Manifest
index 6f530a591a8a..8dfeb329771d 100644
--- a/dev-python/pymediainfo/Manifest
+++ b/dev-python/pymediainfo/Manifest
@@ -1,2 +1,2 @@
-DIST pymediainfo-4.3.tar.gz 437170 BLAKE2B a085268c90fd963501b0f57f4e58e000c58db57e902bfedf13b67ae2b56334b333bb028f24f7593416ba956943650031a3ab0b6d6627c9ffd3728e70c34182bb SHA512 641b335761a7382b4bb7e559afbba1a9694a3b588bc329187b62d1d6cb769a6ff0c110033e4fb50ab39991687a6f728cab53d528ecedf0164c55a9ce31250fe8
 DIST pymediainfo-5.0.3.tar.gz 445381 BLAKE2B f3ff936100badf6899cd0eb3e1155ac82b2f6831dd9a32baf9c1f67f3f5948e5731798c3630aecd97cd86ecbd5a492e73353c19637775453a1fe291d0a15ce33 SHA512 4124b69910050fb84162140cda5e184cb0fc13b06b85ae61ff6e47b4fca236242558b9c3c8ea90ab804ed9400171f7b1dccc25ec5961b37d1f68de21fe64580e
+DIST pymediainfo-5.0.4.tar.gz 445381 BLAKE2B 37578ba4c748ad7b8fbd435ce8bd4b452812667aec06131b00e27bdc7b50baf10e8d8517e270d1f02eb7c867a278ccf68b3c5f26a588a55c970b79287aabe31d SHA512 0bc231b51e526bf69d10c59085814578c9f5fb542099613ea014484cfb37757413e640332604c01070d5e6bf81564514346400b5a7522864a5755acece2aafa8
diff --git a/dev-python/pymediainfo/pymediainfo-4.3.ebuild b/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
index e0d9a323df48..96ab00fd7f84 100644
--- a/dev-python/pymediainfo/pymediainfo-4.3.ebuild
+++ b/dev-python/pymediainfo/pymediainfo-5.0.4.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# 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 )
 PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,7 +16,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="media-libs/libmediainfo"
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_7)
+	media-libs/libmediainfo
+"
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs dev-python/alabaster
diff --git a/dev-python/pypiserver/metadata.xml b/dev-python/pypiserver/metadata.xml
index d847b6218353..511fb95790c5 100644
--- a/dev-python/pypiserver/metadata.xml
+++ b/dev-python/pypiserver/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">pypiserver</remote-id>
   <remote-id type="github">pypiserver/pypiserver</remote-id>
+  <remote-id type="cpe">cpe:/a:python:pypiserver</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/pysaml2/metadata.xml b/dev-python/pysaml2/metadata.xml
index ffe2d164e4c7..81c3e2e16f14 100644
--- a/dev-python/pysaml2/metadata.xml
+++ b/dev-python/pysaml2/metadata.xml
@@ -15,6 +15,7 @@
  <upstream>
   <remote-id type="pypi">pysaml2</remote-id>
   <remote-id type="github">rohe/pysaml2</remote-id>
+  <remote-id type="cpe">cpe:/a:pysaml2_project:pysaml2</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/python-cinderclient/Manifest b/dev-python/python-cinderclient/Manifest
index dc9bbd85bb25..958398611099 100644
--- a/dev-python/python-cinderclient/Manifest
+++ b/dev-python/python-cinderclient/Manifest
@@ -1,2 +1 @@
-DIST python-cinderclient-7.2.0.tar.gz 248517 BLAKE2B 8d992762d3ee69db12f51f6e4e005c6781c865274d42ba31d693854f1c5267a1a15cf5591ed262dacf463a10a719069fc1db67a4fcc95d528b964e128c50a8c8 SHA512 535be2d6e71a9fc415b17929a78cf7c8f1e5f5f2764637fbcd22c90b08da4ae477b863c913faad24439aea06e234cf26a66f392d54e5238af4c2730f4a087a13
 DIST python-cinderclient-7.2.1.tar.gz 251082 BLAKE2B 20b1ae9ecce0161e225b510363be74f7197075bd2247d3f5386894040582a61379faa1825197728bf9981fb9c6d66cc020483a07c0781e30e43f6bdadcb33185 SHA512 c434a353185d8e47d5849f08e7c9418454a5f643292837f0890f9aaccbf939be4528ae75851164068a2bc2ea39a4c841965be664bae4e7d37fec54a55c8332dc
diff --git a/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild b/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
deleted file mode 100644
index 6c3cfe221664..000000000000
--- a/dev-python/python-cinderclient/python-cinderclient-7.2.0.ebuild
+++ /dev/null
@@ -1,34 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A client for the OpenStack Cinder API"
-HOMEPAGE="https://launchpad.net/python-cinderclient"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild b/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild
index af863b974a7b..6c3cfe221664 100644
--- a/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild
+++ b/dev-python/python-cinderclient/python-cinderclient-7.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index f1e038677829..52afbfe12445 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -13,6 +13,7 @@
  <upstream>
   <remote-id type="bitbucket">vinay.sajip/python-gnupg</remote-id>
   <remote-id type="pypi">python-gnupg</remote-id>
+  <remote-id type="cpe">cpe:/a:python:python-gnupg</remote-id>
   <bugs-to>https://bitbucket.org/vinay.sajip/python-gnupg/issues/new</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index bbd76a9b1369..b814e5eb7526 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">pyxdg</remote-id>
   <remote-id type="launchpad">pyxdg</remote-id>
+  <remote-id type="cpe">cpe:/a:python:pyxdg</remote-id>
   <bugs-to>https://bugs.freedesktop.org/</bugs-to>
   <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
  </upstream>
diff --git a/dev-python/pyyaml/metadata.xml b/dev-python/pyyaml/metadata.xml
index ed46fb77d185..bfbd68b5228d 100644
--- a/dev-python/pyyaml/metadata.xml
+++ b/dev-python/pyyaml/metadata.xml
@@ -6,7 +6,7 @@
   <name>Python</name>
  </maintainer>
  <upstream>
-  <remote-id type="cpe">cpe:/a:pyyaml_project:pyyaml</remote-id>
+  <remote-id type="cpe">cpe:/a:pyyaml:pyyaml</remote-id>
   <remote-id type="pypi">PyYAML</remote-id>
   <remote-id type="github">yaml/pyyaml</remote-id>
  </upstream>
diff --git a/dev-python/requests/metadata.xml b/dev-python/requests/metadata.xml
index cca4ded9c519..79256fc771d5 100644
--- a/dev-python/requests/metadata.xml
+++ b/dev-python/requests/metadata.xml
@@ -13,7 +13,7 @@
   </longdescription>
  <upstream>
   <remote-id type="pypi">requests</remote-id>
-  <remote-id type="cpe">cpe:/a:python-requests:requests</remote-id>
+  <remote-id type="cpe">cpe:/a:python:requests</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
index 41da73cdbb4e..398066410d82 100644
--- a/dev-python/rope/metadata.xml
+++ b/dev-python/rope/metadata.xml
@@ -9,6 +9,7 @@
   <remote-id type="pypi">rope</remote-id>
   <remote-id type="sourceforge">rope</remote-id>
   <remote-id type="github">python-rope/rope</remote-id>
+  <remote-id type="cpe">cpe:/a:rope_project:rope</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
index e03da8b97677..d7844a3ca802 100644
--- a/dev-python/rply/metadata.xml
+++ b/dev-python/rply/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="github">alex/rply</remote-id>
   <remote-id type="pypi">rply</remote-id>
+  <remote-id type="cpe">cpe:/a:python:rply</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index eff760e083b6..c0d9c04504ab 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -13,6 +13,7 @@
   <remote-id type="sourceforge">rpyc</remote-id>
   <remote-id type="pypi">rpyc</remote-id>
   <remote-id type="github">tomerfiliba-org/rpyc</remote-id>
+  <remote-id type="cpe">cpe:/a:rpyc_project:rpyc</remote-id>
  </upstream>
  <use>
   <flag name="numpy">Run tests depending on
diff --git a/dev-python/rsa/metadata.xml b/dev-python/rsa/metadata.xml
index b7b88a27dd6d..57cb37279926 100644
--- a/dev-python/rsa/metadata.xml
+++ b/dev-python/rsa/metadata.xml
@@ -7,6 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">rsa</remote-id>
+  <remote-id type="cpe">cpe:/a:python-rsa_project:python-rsa</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/slixmpp/metadata.xml b/dev-python/slixmpp/metadata.xml
index 4f9418ef7c86..9799bb06e668 100644
--- a/dev-python/slixmpp/metadata.xml
+++ b/dev-python/slixmpp/metadata.xml
@@ -11,6 +11,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">slixmpp</remote-id>
+  <remote-id type="cpe">cpe:/a:slixmpp_project:slixmpp</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 4303c1479b7b..1eabbf3323b1 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,2 +1,3 @@
 DIST Sphinx-3.5.2.tar.gz 5907358 BLAKE2B 59b2789d7f3cc34622f34c54b5d614be7fa22d9d61cbb6c096ac7efe8f011331f51af12986d505245a30c9583050ae8c012ac736cd8ff5234f528616999dc325 SHA512 97f1589726fe5bdf48b5bc8bfc53267fb4dfa2f21d5d9eefbd9bcc9ff5cc0c7846840b0fe5fcdd133d9735d402189d5b89202de4e462dce99a7653d6f1a86ff9
 DIST Sphinx-3.5.3.tar.gz 5907994 BLAKE2B 3bd5a08dcc860ef419a085a991bb28d16d6a721f253a0ee25333cab5add2257a0557d7b586e89193e9a26e34d39ce5ef9992a9b2c8b8457e8ae7d82a928d32c5 SHA512 4e2cb1c3632ec131cc724f306bbe084691c2178620d1dec130d3bc8be3ee116c14093863ec768242965be9f28c74ed704768b23a62a1510ff00bf1c2edb810df
+DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
diff --git a/dev-python/sphinx/sphinx-3.5.4.ebuild b/dev-python/sphinx/sphinx-3.5.4.ebuild
new file mode 100644
index 000000000000..fb520c633708
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.5.4.ebuild
@@ -0,0 +1,125 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.17[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_7)
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment_py36
+		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/sqlalchemy/metadata.xml b/dev-python/sqlalchemy/metadata.xml
index 757813390ec3..590270061b5e 100644
--- a/dev-python/sqlalchemy/metadata.xml
+++ b/dev-python/sqlalchemy/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">SQLAlchemy</remote-id>
   <remote-id type="github">sqlalchemy/sqlalchemy</remote-id>
+  <remote-id type="cpe">cpe:/a:sqlalchemy:sqlalchemy</remote-id>
   <bugs-to>https://github.com/sqlalchemy/sqlalchemy/issues</bugs-to>
  </upstream>
  <origin>gentoo-staging</origin>
diff --git a/dev-python/twisted/metadata.xml b/dev-python/twisted/metadata.xml
index b94b54b8e46a..cf6718cbcb93 100644
--- a/dev-python/twisted/metadata.xml
+++ b/dev-python/twisted/metadata.xml
@@ -19,6 +19,7 @@ twisted.trial: A unit testing framework that integrates well with Twisted-based
 	</longdescription>
  <upstream>
   <remote-id type="pypi">Twisted</remote-id>
+  <remote-id type="cpe">cpe:/a:twistedmatrix:twisted</remote-id>
  </upstream>
  <use>
   <flag name="conch">include Twisted SSHv2 implementation</flag>
diff --git a/dev-python/typed-ast/metadata.xml b/dev-python/typed-ast/metadata.xml
index 907e11232c74..803cced65108 100644
--- a/dev-python/typed-ast/metadata.xml
+++ b/dev-python/typed-ast/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="github">python/typed_ast</remote-id>
   <remote-id type="pypi">typed-ast</remote-id>
+  <remote-id type="cpe">cpe:/a:python:typed_ast</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-python/urllib3/metadata.xml b/dev-python/urllib3/metadata.xml
index 7f2d2de01723..c95094f1d0ee 100644
--- a/dev-python/urllib3/metadata.xml
+++ b/dev-python/urllib3/metadata.xml
@@ -7,7 +7,7 @@
  </maintainer>
  <upstream>
   <remote-id type="pypi">urllib3</remote-id>
-  <remote-id type="cpe">cpe:/a:urllib3:urllib3</remote-id>
+  <remote-id type="cpe">cpe:/a:python:urllib3</remote-id>
   <remote-id type="github">urllib3/urllib3</remote-id>
  </upstream>
  <use>
diff --git a/dev-python/virtualenv/metadata.xml b/dev-python/virtualenv/metadata.xml
index 55a10408a221..32b732d567e3 100644
--- a/dev-python/virtualenv/metadata.xml
+++ b/dev-python/virtualenv/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">virtualenv</remote-id>
   <remote-id type="github">pypa/virtualenv</remote-id>
+  <remote-id type="cpe">cpe:/a:python:virtualenv</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
  <stabilize-allarches/>
diff --git a/dev-python/werkzeug/metadata.xml b/dev-python/werkzeug/metadata.xml
index fbd4bc7f1899..6a82b486f075 100644
--- a/dev-python/werkzeug/metadata.xml
+++ b/dev-python/werkzeug/metadata.xml
@@ -8,6 +8,7 @@
  <upstream>
   <remote-id type="pypi">Werkzeug</remote-id>
   <remote-id type="github">pallets/werkzeug</remote-id>
+  <remote-id type="cpe">cpe:/a:palletsprojects:werkzeug</remote-id>
  </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file