public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/requests-unixsocket/, dev-python/pytest-freezegun/, ...
@ 2020-12-11 17:19 Michał Górny
  0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2020-12-11 17:19 UTC (permalink / raw
  To: gentoo-commits

uildtester/metadata.xml dev-python/editorconfig-core-py/metadata.xml dev-python/empy/metadata.xml dev-python/entrypoint2/metadata.xml dev-python/exam/metadata.xml dev-python/eyeD3/metadata.xml dev-python/fastjsonschema/metadata.xml dev-python/fido2/metadata.xml dev-python/fields/metadata.xml dev-python/findimports/metadata.xml dev-python/fitsio/metadata.xml dev-python/flask-assets/metadata.xml dev-python/flask-paginate/metadata.xml dev-python/fleep/metadata.xml dev-python/flufl-bounce/metadata.xml dev-python/flufl-i18n/metadata.xml dev-python/flufl-lock/metadata.xml dev-python/fonttools/metadata.xml dev-python/funcy/metadata.xml dev-python/fuse-python/metadata.xml dev-python/github3/metadata.xml dev-python/google-api-core/metadata.xml dev-python/google-apitools/metadata.xml dev-python/graph-tool/metadata.xml dev-python/gsd/metadata.xml dev-python/gst-python/metadata.xml dev-python/hcloud-python/metadata.xml dev-python/helpdev/metadata.xml dev-python/httmock/metadata.xml dev-python/ht
 tpstat/metadata.xml dev-python/ifaddr/metadata.xml dev-python/imageio/metadata.xml dev-python/iniconfig/metadata.xml dev-python/ioflo/metadata.xml dev-python/jaraco-context/metadata.xml dev-python/jsonext/metadata.xml dev-python/jsonrpclib/metadata.xml dev-python/jupyterlab_pygments/metadata.xml dev-python/kaptan/metadata.xml dev-python/lazr-config/metadata.xml dev-python/lcdproc/metadata.xml dev-python/libpy_simdjson/metadata.xml dev-python/libsass/metadata.xml dev-python/libtmux/metadata.xml dev-python/lit/metadata.xml dev-python/livereload/metadata.xml dev-python/lmfit/metadata.xml dev-python/loky/metadata.xml dev-python/lunr/metadata.xml dev-python/matterhook/metadata.xml dev-python/mdx_gh_links/metadata.xml dev-python/mecab-python/metadata.xml dev-python/mechanize/metadata.xml dev-python/mediafile/metadata.xml dev-python/micawber/metadata.xml dev-python/miniupnpc/metadata.xml dev-python/mmtf-python/metadata.xml dev-python/mongoengine/metadata.xml dev-python/moviepy/metadata.xml
  dev-python/mpdlcd/metadata.xml dev-python/mss/metada
ta.xml dev-python/multidict/metadata.xml dev-python/mygpoclient/metadata.xml dev-python/mysql-connector-python/metadata.xml dev-python/neovim-remote/metadata.xml dev-python/nnpy/metadata.xml dev-python/nodeenv/metadata.xml dev-python/nose2/metadata.xml dev-python/nuitka/metadata.xml dev-python/oauth2client/metadata.xml dev-python/osrf_pycommon/metadata.xml dev-python/ovsdbapp/metadata.xml dev-python/paho-mqtt/metadata.xml dev-python/parameterized/metadata.xml dev-python/parametrized/metadata.xml dev-python/peewee/metadata.xml dev-python/pgspecial/metadata.xml dev-python/plyr/metadata.xml dev-python/pocketlint/metadata.xml dev-python/podcastparser/metadata.xml dev-python/polygon/metadata.xml dev-python/pony/metadata.xml dev-python/publicsuffix/metadata.xml dev-python/pure-sasl/metadata.xml dev-python/pyFFTW/metadata.xml dev-python/pyalsa/metadata.xml dev-python/pybind11/metadata.xml dev-python/pycairo/metadata.xml dev-python/pychm/metadata.xml dev-python/pychromecast/metadata.xml dev-
 python/pychroot/metadata.xml dev-python/pyclipper/metadata.xml dev-python/pycxx/metadata.xml dev-python/pydata-sphinx-theme/metadata.xml dev-python/pyfltk/metadata.xml dev-python/pygame_sdl2/metadata.xml dev-python/pygobject/metadata.xml dev-python/pygpgme/metadata.xml dev-python/pyh2o/metadata.xml dev-python/pymad/metadata.xml dev-python/pymetar/metadata.xml dev-python/pymilter/metadata.xml dev-python/pymysql/metadata.xml dev-python/pynput/metadata.xml dev-python/pyparted/metadata.xml dev-python/pyperclip/metadata.xml dev-python/pyproject2setuppy/metadata.xml dev-python/pyre2/metadata.xml dev-python/pyscreenshot/metadata.xml dev-python/pyside2/metadata.xml dev-python/pysimdjson/metadata.xml dev-python/pysmi/metadata.xml dev-python/pyspectrum2/metadata.xml dev-python/pyspelling/metadata.xml dev-python/pytest-datadir/metadata.xml dev-python/pytest-faulthandler/metadata.xml dev-python/pytest-freezegun/metadata.xml dev-python/pytest-helpers-namespace/metadata.xml dev-python/pytest-lazy
 -fixture/metadata.xml dev-python/pytest-regressions/m
etadata.xml dev-python/pytest-salt-factories/metadata.xml dev-python/pytest-salt/metadata.xml dev-python/pytest-tempdir/metadata.xml dev-python/pytest-testmon/metadata.xml dev-python/python-axolotl-curve25519/metadata.xml dev-python/python-axolotl/metadata.xml dev-python/python-blazarclient/metadata.xml dev-python/python-debian/metadata.xml dev-python/python-discid/metadata.xml dev-python/python-dotenv/metadata.xml dev-python/python-efl/metadata.xml dev-python/python-jsonrpc-server/metadata.xml dev-python/python-language-server/metadata.xml dev-python/python-lhafile/metadata.xml dev-python/python-libevdev/metadata.xml dev-python/python-octaviaclient/metadata.xml dev-python/python-poppler-qt5/metadata.xml dev-python/python-prctl/metadata.xml dev-python/python-systemd/metadata.xml dev-python/python-vitrageclient/metadata.xml dev-python/python-xlib/metadata.xml dev-python/python-xmlsec/metadata.xml dev-python/python-zipstream/metadata.xml dev-python/python-zunclient/metadata.xml dev-pyt
 hon/pyvirtualdisplay/metadata.xml dev-python/pyzbar/metadata.xml dev-python/qdarkstyle/metadata.xml dev-python/qtsass/metadata.xml dev-python/re-assert/metadata.xml dev-python/readthedocs-sphinx-ext/metadata.xml dev-python/rencode/metadata.xml dev-python/requests-oauthlib/metadata.xml dev-python/requests-unixsocket/metadata.xml dev-python/retry-decorator/metadata.xml dev-python/rjsmin/metadata.xml dev-python/rply/metadata.xml dev-python/rtimulib/metadata.xml dev-python/sabyenc/metadata.xml dev-python/scikit-build/metadata.xml dev-python/serverfiles/metadata.xml dev-python/setuptools_scm_git_archive/metadata.xml dev-python/shiboken2/metadata.xml dev-python/simplebayes/metadata.xml dev-python/simplesoapy/metadata.xml dev-python/simplespectral/metadata.xml dev-python/slimit/metadata.xml dev-python/sphinx-multiversion/metadata.xml dev-python/sphinx-panels/metadata.xml dev-python/sphinx-testing/metadata.xml dev-python/sphinxcontrib-blockdiag/metadata.xml dev-python/sphinxcontrib-httpexam
 ple/metadata.xml dev-python/spur/metadata.xml dev-pyt
hon/spyder-line-profiler/metadata.xml dev-python/spyder-memory-profiler/metadata.xml dev-python/spyder-notebook/metadata.xml dev-python/spyder-terminal/metadata.xml dev-python/spyder-unittest/metadata.xml dev-python/stapler/metadata.xml dev-python/svgwrite/metadata.xml dev-python/swagger-spec-validator/metadata.xml dev-python/symengine/metadata.xml dev-python/testpath/metadata.xml dev-python/threadpoolctl/metadata.xml dev-python/toml/metadata.xml dev-python/transitions/metadata.xml dev-python/translate-toolkit/metadata.xml dev-python/trustme/metadata.xml dev-python/tvdb_api/metadata.xml dev-python/ubelt/metadata.xml dev-python/uranium/metadata.xml dev-python/urdf_parser_py/metadata.xml dev-python/urlgrabber/metadata.xml dev-python/vcstools/metadata.xml dev-python/vncdotool/metadata.xml dev-python/webassets/metadata.xml dev-python/websockets/metadata.xml dev-python/ws4py/metadata.xml dev-python/wxpython/metadata.xml dev-python/xdoctest/metadata.xml dev-python/yapf/metadata.xml dev-pyt
 hon/yapsy/metadata.xml dev-python/zVMCloudConnector/metadata.xml dev-python/zxcvbn/metadata.xml
X-VCS-Directories: dev-python/xdoctest/ dev-python/pyspectrum2/ dev-python/nose2/ dev-python/docker-py/ dev-python/qdarkstyle/ dev-python/python-axolotl/ dev-python/python-blazarclient/ dev-python/pynput/ dev-python/lit/ dev-python/flask-paginate/ dev-python/python-zunclient/ dev-python/jsonrpclib/ dev-python/spyder-notebook/ dev-python/libpy_simdjson/ dev-python/simplesoapy/ dev-python/pycairo/ dev-python/apsw/ dev-python/wxpython/ dev-python/transitions/ dev-python/slimit/ dev-python/threadpoolctl/ dev-python/pyspelling/ dev-python/deprecated/ dev-python/trustme/ dev-python/pysmi/ dev-python/pytest-faulthandler/ dev-python/python-language-server/ dev-python/spyder-terminal/ dev-python/pyzbar/ dev-python/django-timezone-field/ dev-python/nodeenv/ dev-python/pychroot/ dev-python/python-debian/ dev-python/python-libevdev/ dev-python/paho-mqtt/ dev-python/cvxopt/ dev-python/sphinx-multiversion/ dev-python/dbus-python/ dev-python/eyeD3/ dev-python/sphinx-panels/ dev-python/python-jsonrp
 c-server/ dev-python/pyvirtualdisplay/ dev-python/sabyenc/ dev-python/nnpy/ dev-python/swagger-spec-validator/ dev-python/bibtexparser/ dev-python/editorconfig-core-py/ dev-python/confuse/ dev-python/pyh2o/ dev-python/pytest-testmon/ dev-python/urdf_parser_py/ dev-python/aiofiles/ dev-python/mechanize/ dev-python/blurb/ dev-python/ioflo/ dev-python/mdx_gh_links/ dev-python/pysimdjson/ dev-python/funcy/ dev-python/PyUtilib/ dev-python/osrf_pycommon/ dev-python/zVMCloudConnector/ dev-python/anyqt/ dev-python/pygame_sdl2/ dev-python/mpdlcd/ dev-python/docutils-glep/ dev-python/aiohttp-cors/ dev-python/flufl-bounce/ dev-python/pony/ dev-python/authheaders/ dev-python/python-xlib/ dev-python/pytest-regressions/ dev-python/empy/ dev-python/pygpgme/ dev-python/django-mptt/ dev-python/booleanOperations/ dev-python/readthedocs-sphinx-ext/ dev-python/pyalsa/ dev-python/mongoengine/ dev-python/loky/ dev-python/python-xmlsec/ dev-python/black/ dev-python/imageio/ dev-python/spyder-memory-profil
 er/ dev-python/mediafile/ dev-python/findimports/ dev
-python/fleep/ dev-python/flask-assets/ dev-python/pyparted/ dev-python/pyfltk/ dev-python/pytest-lazy-fixture/ dev-python/spyder-unittest/ dev-python/publicsuffix/ dev-python/vncdotool/ dev-python/lmfit/ dev-python/shiboken2/ dev-python/pychromecast/ dev-python/libtmux/ dev-python/python-dotenv/ dev-python/betamax/ dev-python/sphinx-testing/ dev-python/django-rq/ dev-python/google-apitools/ dev-python/djangorestframework/ dev-python/mmtf-python/ dev-python/django-taggit/ dev-python/stapler/ dev-python/vcstools/ dev-python/serverfiles/ dev-python/cgroup-utils/ dev-python/ubelt/ dev-python/tvdb_api/ dev-python/crcmod/ dev-python/spyder-line-profiler/ dev-python/helpdev/ dev-python/rply/ dev-python/pygobject/ dev-python/polygon/ dev-python/pytest-tempdir/ dev-python/uranium/ dev-python/mss/ dev-python/python-lhafile/ dev-python/httmock/ dev-python/pybind11/ dev-python/fastjsonschema/ dev-python/pyclipper/ dev-python/urlgrabber/ dev-python/lazr-config/ dev-python/entrypoint2/ dev-python
 /symengine/ dev-python/webassets/ dev-python/cli_helpers/ dev-python/requests-oauthlib/ dev-python/jsonext/ dev-python/dockerpty/ dev-python/coreapi/ dev-python/neovim-remote/ dev-python/django-cacheops/ dev-python/setuptools_scm_git_archive/ dev-python/python-axolotl-curve25519/ dev-python/python-poppler-qt5/ dev-python/plyr/ dev-python/jupyterlab_pygments/ dev-python/pymilter/ dev-python/fitsio/ dev-python/libsass/ dev-python/micawber/ dev-python/dissononce/ dev-python/nuitka/ dev-python/ovsdbapp/ dev-python/django-prometheus/ dev-python/fonttools/ dev-python/dbusmock/ dev-python/re-assert/ dev-python/peewee/ dev-python/simplespectral/ dev-python/toml/ dev-python/retry-decorator/ dev-python/parameterized/ dev-python/ifaddr/ dev-python/pyFFTW/ dev-python/python-efl/ dev-python/oauth2client/ dev-python/PyGithub/ dev-python/pytest-salt/ dev-python/httpstat/ dev-python/python-discid/ dev-python/alagitpull/ dev-python/pgspecial/ dev-python/hcloud-python/ dev-python/pymetar/ dev-python/
 ws4py/ dev-python/jaraco-context/ dev-python/brython/
 dev-python/podcastparser/ dev-python/pymysql/ dev-python/flufl-lock/ dev-python/easyprocess/ dev-python/gst-python/ dev-python/ctypesgen/ dev-python/ebuildtester/ dev-python/astunparse/ dev-python/rjsmin/ dev-python/fields/ dev-python/pytest-datadir/ dev-python/python-prctl/ dev-python/qtsass/ dev-python/gsd/ dev-python/livereload/ dev-python/pyscreenshot/ dev-python/testpath/ dev-python/python-zipstream/ dev-python/bitstring/ dev-python/cangjie/ dev-python/translate-toolkit/ dev-python/pytest-salt-factories/ dev-python/fuse-python/ dev-python/pocketlint/ dev-python/google-api-core/ dev-python/pymad/ dev-python/flufl-i18n/ dev-python/matterhook/ dev-python/consonance/ dev-python/pydata-sphinx-theme/ dev-python/yapsy/ dev-python/cjkwrap/ dev-python/mecab-python/ dev-python/pytest-freezegun/ dev-python/requests-unixsocket/ dev-python/drf-yasg/ dev-python/svgwrite/ dev-python/pyside2/ dev-python/django-pglocks/ dev-python/sphinxcontrib-httpexample/ dev-python/absl-py/ dev-python/double
 x-expects/ dev-python/miniupnpc/ dev-python/yapf/ dev-python/python-systemd/ dev-python/parametrized/ dev-python/exam/ dev-python/iniconfig/ dev-python/coreschema/ dev-python/rencode/ dev-python/boto3/ dev-python/zxcvbn/ dev-python/lcdproc/ dev-python/kaptan/ dev-python/mygpoclient/ dev-python/scikit-build/ dev-python/python-vitrageclient/ dev-python/multidict/ dev-python/django-js-asset/ dev-python/graph-tool/ dev-python/pyre2/ dev-python/moviepy/ dev-python/github3/ dev-python/catkin_pkg/ dev-python/sphinxcontrib-blockdiag/ dev-python/betamax-matchers/ dev-python/python-octaviaclient/ dev-python/pychm/ dev-python/casttube/ dev-python/simplebayes/ dev-python/pytest-helpers-namespace/ dev-python/pycxx/ dev-python/spur/ dev-python/pyperclip/ dev-python/ctypescrypto/ dev-python/backports-zoneinfo/ dev-python/mysql-connector-python/ dev-python/duecredit/ dev-python/pure-sasl/ dev-python/lunr/ dev-python/fido2/ dev-python/django-filter/ dev-python/rtimulib/ dev-python/websockets/ dev-py
 thon/django-taggit-serializer/ dev-python/asteval/ de
v-python/pyproject2setuppy/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: b0efa69df19e722ea87fa16bd36b71fb3a4d23eb
X-VCS-Branch: master
Date: Fri, 11 Dec 2020 17:19:47 +0000 (UTC)

commit:     b0efa69df19e722ea87fa16bd36b71fb3a4d23eb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 15:17:41 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 17:19:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0efa69d

dev-python/*: add pypi remote-ids

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/PyGithub/metadata.xml                   | 25 ++++-----
 dev-python/PyUtilib/metadata.xml                   | 17 ++++---
 dev-python/absl-py/metadata.xml                    |  1 +
 dev-python/aiofiles/metadata.xml                   |  1 +
 dev-python/aiohttp-cors/metadata.xml               |  1 +
 dev-python/alagitpull/metadata.xml                 | 13 +++--
 dev-python/anyqt/metadata.xml                      |  5 +-
 dev-python/apsw/metadata.xml                       | 27 +++++-----
 dev-python/asteval/metadata.xml                    |  3 ++
 dev-python/astunparse/metadata.xml                 |  3 ++
 dev-python/authheaders/metadata.xml                |  3 ++
 dev-python/backports-zoneinfo/metadata.xml         |  3 ++
 dev-python/betamax-matchers/metadata.xml           |  3 ++
 dev-python/betamax/metadata.xml                    |  3 ++
 dev-python/bibtexparser/metadata.xml               |  1 +
 dev-python/bitstring/metadata.xml                  |  1 +
 dev-python/black/metadata.xml                      | 11 ++--
 dev-python/blurb/metadata.xml                      | 39 +++++++-------
 dev-python/booleanOperations/metadata.xml          |  3 ++
 dev-python/boto3/metadata.xml                      |  1 +
 dev-python/brython/metadata.xml                    | 17 ++++---
 dev-python/cangjie/metadata.xml                    |  1 +
 dev-python/casttube/metadata.xml                   |  3 ++
 dev-python/catkin_pkg/metadata.xml                 |  1 +
 dev-python/cgroup-utils/metadata.xml               | 23 +++++----
 dev-python/cjkwrap/metadata.xml                    | 11 ++--
 dev-python/cli_helpers/metadata.xml                |  1 +
 dev-python/confuse/metadata.xml                    |  1 +
 dev-python/consonance/metadata.xml                 |  1 +
 dev-python/coreapi/metadata.xml                    |  3 ++
 dev-python/coreschema/metadata.xml                 |  3 ++
 dev-python/crcmod/metadata.xml                     |  1 +
 dev-python/ctypescrypto/metadata.xml               |  5 +-
 dev-python/ctypesgen/metadata.xml                  |  1 +
 dev-python/cvxopt/metadata.xml                     | 39 +++++++-------
 dev-python/dbus-python/metadata.xml                | 17 ++++---
 dev-python/dbusmock/metadata.xml                   |  3 ++
 dev-python/deprecated/metadata.xml                 |  3 ++
 dev-python/dissononce/metadata.xml                 |  1 +
 dev-python/django-cacheops/metadata.xml            |  3 ++
 dev-python/django-filter/metadata.xml              |  3 ++
 dev-python/django-js-asset/metadata.xml            |  3 ++
 dev-python/django-mptt/metadata.xml                |  3 ++
 dev-python/django-pglocks/metadata.xml             |  3 ++
 dev-python/django-prometheus/metadata.xml          |  3 ++
 dev-python/django-rq/metadata.xml                  |  3 ++
 dev-python/django-taggit-serializer/metadata.xml   |  3 ++
 dev-python/django-taggit/metadata.xml              |  3 ++
 dev-python/django-timezone-field/metadata.xml      |  3 ++
 dev-python/djangorestframework/metadata.xml        |  3 ++
 dev-python/docker-py/metadata.xml                  | 17 ++++---
 dev-python/dockerpty/metadata.xml                  |  1 +
 dev-python/docutils-glep/metadata.xml              |  3 ++
 dev-python/doublex-expects/metadata.xml            |  1 +
 dev-python/drf-yasg/metadata.xml                   |  3 ++
 dev-python/duecredit/metadata.xml                  |  1 +
 dev-python/easyprocess/metadata.xml                |  3 ++
 dev-python/ebuildtester/metadata.xml               |  3 ++
 dev-python/editorconfig-core-py/metadata.xml       |  3 +-
 dev-python/empy/metadata.xml                       |  3 ++
 dev-python/entrypoint2/metadata.xml                |  3 ++
 dev-python/exam/metadata.xml                       | 27 +++++-----
 dev-python/eyeD3/metadata.xml                      |  5 +-
 dev-python/fastjsonschema/metadata.xml             |  3 ++
 dev-python/fido2/metadata.xml                      | 27 +++++-----
 dev-python/fields/metadata.xml                     | 19 +++----
 dev-python/findimports/metadata.xml                |  3 ++
 dev-python/fitsio/metadata.xml                     | 35 ++++++-------
 dev-python/flask-assets/metadata.xml               |  1 +
 dev-python/flask-paginate/metadata.xml             | 31 ++++++------
 dev-python/fleep/metadata.xml                      |  3 ++
 dev-python/flufl-bounce/metadata.xml               |  3 ++
 dev-python/flufl-i18n/metadata.xml                 |  3 ++
 dev-python/flufl-lock/metadata.xml                 |  3 ++
 dev-python/fonttools/metadata.xml                  |  1 +
 dev-python/funcy/metadata.xml                      |  3 ++
 dev-python/fuse-python/metadata.xml                |  1 +
 dev-python/github3/metadata.xml                    |  3 +-
 dev-python/google-api-core/metadata.xml            | 13 +++--
 dev-python/google-apitools/metadata.xml            | 15 +++---
 dev-python/graph-tool/metadata.xml                 |  3 ++
 dev-python/gsd/metadata.xml                        |  3 ++
 dev-python/gst-python/metadata.xml                 |  8 +--
 dev-python/hcloud-python/metadata.xml              | 15 +++---
 dev-python/helpdev/metadata.xml                    | 20 ++++----
 dev-python/httmock/metadata.xml                    |  1 +
 dev-python/httpstat/metadata.xml                   |  1 +
 dev-python/ifaddr/metadata.xml                     |  3 ++
 dev-python/imageio/metadata.xml                    |  1 +
 dev-python/iniconfig/metadata.xml                  |  3 ++
 dev-python/ioflo/metadata.xml                      | 23 +++++----
 dev-python/jaraco-context/metadata.xml             |  3 ++
 dev-python/jsonext/metadata.xml                    |  3 ++
 dev-python/jsonrpclib/metadata.xml                 | 25 ++++-----
 dev-python/jupyterlab_pygments/metadata.xml        | 17 ++++---
 dev-python/kaptan/metadata.xml                     | 11 ++--
 dev-python/lazr-config/metadata.xml                |  3 ++
 dev-python/lcdproc/metadata.xml                    |  1 +
 dev-python/libpy_simdjson/metadata.xml             |  3 ++
 dev-python/libsass/metadata.xml                    | 20 ++++----
 dev-python/libtmux/metadata.xml                    | 11 ++--
 dev-python/lit/metadata.xml                        |  3 ++
 dev-python/livereload/metadata.xml                 |  1 +
 dev-python/lmfit/metadata.xml                      |  3 ++
 dev-python/loky/metadata.xml                       |  3 ++
 dev-python/lunr/metadata.xml                       |  1 +
 dev-python/matterhook/metadata.xml                 | 15 +++---
 dev-python/mdx_gh_links/metadata.xml               |  3 ++
 dev-python/mecab-python/metadata.xml               |  1 +
 dev-python/mechanize/metadata.xml                  | 35 ++++++-------
 dev-python/mediafile/metadata.xml                  |  1 +
 dev-python/micawber/metadata.xml                   | 15 +++---
 dev-python/miniupnpc/metadata.xml                  | 11 ++--
 dev-python/mmtf-python/metadata.xml                |  1 +
 dev-python/mongoengine/metadata.xml                | 15 +++---
 dev-python/moviepy/metadata.xml                    |  1 +
 dev-python/mpdlcd/metadata.xml                     |  1 +
 dev-python/mss/metadata.xml                        |  3 ++
 dev-python/multidict/metadata.xml                  |  3 +-
 dev-python/mygpoclient/metadata.xml                | 19 ++++---
 dev-python/mysql-connector-python/metadata.xml     | 19 ++++---
 dev-python/neovim-remote/metadata.xml              |  3 ++
 dev-python/nnpy/metadata.xml                       |  3 +-
 dev-python/nodeenv/metadata.xml                    | 15 +++---
 dev-python/nose2/metadata.xml                      |  3 +-
 dev-python/nuitka/metadata.xml                     | 35 ++++++-------
 dev-python/oauth2client/metadata.xml               | 17 ++++---
 dev-python/osrf_pycommon/metadata.xml              |  1 +
 dev-python/ovsdbapp/metadata.xml                   |  3 ++
 dev-python/paho-mqtt/metadata.xml                  |  3 +-
 dev-python/parameterized/metadata.xml              |  5 +-
 dev-python/parametrized/metadata.xml               |  5 +-
 dev-python/peewee/metadata.xml                     | 15 +++---
 dev-python/pgspecial/metadata.xml                  | 33 ++++++------
 dev-python/plyr/metadata.xml                       |  3 +-
 dev-python/pocketlint/metadata.xml                 | 15 +++---
 dev-python/podcastparser/metadata.xml              | 11 ++--
 dev-python/polygon/metadata.xml                    |  3 ++
 dev-python/pony/metadata.xml                       |  3 ++
 dev-python/publicsuffix/metadata.xml               |  3 ++
 dev-python/pure-sasl/metadata.xml                  |  9 ++--
 dev-python/pyFFTW/metadata.xml                     |  1 +
 dev-python/pyalsa/metadata.xml                     | 19 ++++---
 dev-python/pybind11/metadata.xml                   |  3 ++
 dev-python/pycairo/metadata.xml                    | 11 ++--
 dev-python/pychm/metadata.xml                      |  1 +
 dev-python/pychromecast/metadata.xml               |  3 ++
 dev-python/pychroot/metadata.xml                   |  9 ++--
 dev-python/pyclipper/metadata.xml                  |  3 ++
 dev-python/pycxx/metadata.xml                      |  1 +
 dev-python/pydata-sphinx-theme/metadata.xml        |  3 ++
 dev-python/pyfltk/metadata.xml                     |  1 +
 dev-python/pygame_sdl2/metadata.xml                |  1 +
 dev-python/pygobject/metadata.xml                  |  3 ++
 dev-python/pygpgme/metadata.xml                    |  1 +
 dev-python/pyh2o/metadata.xml                      | 25 ++++-----
 dev-python/pymad/metadata.xml                      | 15 +++---
 dev-python/pymetar/metadata.xml                    | 15 +++---
 dev-python/pymilter/metadata.xml                   |  1 +
 dev-python/pymysql/metadata.xml                    | 25 ++++-----
 dev-python/pynput/metadata.xml                     |  3 ++
 dev-python/pyparted/metadata.xml                   |  1 +
 dev-python/pyperclip/metadata.xml                  |  3 ++
 dev-python/pyproject2setuppy/metadata.xml          |  3 ++
 dev-python/pyre2/metadata.xml                      |  3 ++
 dev-python/pyscreenshot/metadata.xml               |  3 ++
 dev-python/pyside2/metadata.xml                    |  3 ++
 dev-python/pysimdjson/metadata.xml                 |  3 ++
 dev-python/pysmi/metadata.xml                      | 21 ++++----
 dev-python/pyspectrum2/metadata.xml                |  1 +
 dev-python/pyspelling/metadata.xml                 |  4 +-
 dev-python/pytest-datadir/metadata.xml             |  3 ++
 dev-python/pytest-faulthandler/metadata.xml        |  3 ++
 dev-python/pytest-freezegun/metadata.xml           |  3 ++
 dev-python/pytest-helpers-namespace/metadata.xml   |  3 ++
 dev-python/pytest-lazy-fixture/metadata.xml        | 21 ++++----
 dev-python/pytest-regressions/metadata.xml         |  3 ++
 dev-python/pytest-salt-factories/metadata.xml      |  3 ++
 dev-python/pytest-salt/metadata.xml                |  3 ++
 dev-python/pytest-tempdir/metadata.xml             | 11 ++--
 dev-python/pytest-testmon/metadata.xml             |  3 ++
 dev-python/python-axolotl-curve25519/metadata.xml  |  1 +
 dev-python/python-axolotl/metadata.xml             |  1 +
 dev-python/python-blazarclient/metadata.xml        |  3 ++
 dev-python/python-debian/metadata.xml              |  3 ++
 dev-python/python-discid/metadata.xml              | 15 +++---
 dev-python/python-dotenv/metadata.xml              |  5 +-
 dev-python/python-efl/metadata.xml                 | 25 +++++----
 dev-python/python-jsonrpc-server/metadata.xml      | 20 ++++----
 dev-python/python-language-server/metadata.xml     | 20 ++++----
 dev-python/python-lhafile/metadata.xml             |  1 +
 dev-python/python-libevdev/metadata.xml            | 11 ++--
 dev-python/python-octaviaclient/metadata.xml       |  3 ++
 dev-python/python-poppler-qt5/metadata.xml         |  1 +
 dev-python/python-prctl/metadata.xml               | 15 +++---
 dev-python/python-systemd/metadata.xml             |  1 +
 dev-python/python-vitrageclient/metadata.xml       |  3 ++
 dev-python/python-xlib/metadata.xml                |  3 +-
 dev-python/python-xmlsec/metadata.xml              | 11 ++--
 dev-python/python-zipstream/metadata.xml           |  1 +
 dev-python/python-zunclient/metadata.xml           |  3 ++
 dev-python/pyvirtualdisplay/metadata.xml           |  3 ++
 dev-python/pyzbar/metadata.xml                     |  3 ++
 dev-python/qdarkstyle/metadata.xml                 |  4 +-
 dev-python/qtsass/metadata.xml                     | 20 ++++----
 dev-python/re-assert/metadata.xml                  |  3 ++
 dev-python/readthedocs-sphinx-ext/metadata.xml     | 13 +++--
 dev-python/rencode/metadata.xml                    |  1 +
 dev-python/requests-oauthlib/metadata.xml          |  1 +
 dev-python/requests-unixsocket/metadata.xml        |  3 ++
 dev-python/retry-decorator/metadata.xml            | 17 ++++---
 dev-python/rjsmin/metadata.xml                     |  3 ++
 dev-python/rply/metadata.xml                       | 15 +++---
 dev-python/rtimulib/metadata.xml                   |  1 +
 dev-python/sabyenc/metadata.xml                    |  3 ++
 dev-python/scikit-build/metadata.xml               |  4 +-
 dev-python/serverfiles/metadata.xml                |  9 ++--
 dev-python/setuptools_scm_git_archive/metadata.xml |  3 ++
 dev-python/shiboken2/metadata.xml                  |  3 ++
 dev-python/simplebayes/metadata.xml                |  1 +
 dev-python/simplesoapy/metadata.xml                |  1 +
 dev-python/simplespectral/metadata.xml             |  1 +
 dev-python/slimit/metadata.xml                     |  3 ++
 dev-python/sphinx-multiversion/metadata.xml        |  3 ++
 dev-python/sphinx-panels/metadata.xml              |  3 ++
 dev-python/sphinx-testing/metadata.xml             | 17 ++++---
 dev-python/sphinxcontrib-blockdiag/metadata.xml    |  1 +
 dev-python/sphinxcontrib-httpexample/metadata.xml  | 27 +++++-----
 dev-python/spur/metadata.xml                       |  3 ++
 dev-python/spyder-line-profiler/metadata.xml       |  5 +-
 dev-python/spyder-memory-profiler/metadata.xml     |  5 +-
 dev-python/spyder-notebook/metadata.xml            |  5 +-
 dev-python/spyder-terminal/metadata.xml            |  5 +-
 dev-python/spyder-unittest/metadata.xml            |  5 +-
 dev-python/stapler/metadata.xml                    |  1 +
 dev-python/svgwrite/metadata.xml                   |  3 ++
 dev-python/swagger-spec-validator/metadata.xml     |  3 ++
 dev-python/symengine/metadata.xml                  | 17 ++++---
 dev-python/testpath/metadata.xml                   | 37 +++++++-------
 dev-python/threadpoolctl/metadata.xml              | 19 ++++---
 dev-python/toml/metadata.xml                       | 19 +++----
 dev-python/transitions/metadata.xml                |  1 +
 dev-python/translate-toolkit/metadata.xml          |  1 +
 dev-python/trustme/metadata.xml                    |  3 ++
 dev-python/tvdb_api/metadata.xml                   | 15 +++---
 dev-python/ubelt/metadata.xml                      |  4 +-
 dev-python/uranium/metadata.xml                    |  1 +
 dev-python/urdf_parser_py/metadata.xml             |  3 +-
 dev-python/urlgrabber/metadata.xml                 | 59 ++++++++++++----------
 dev-python/vcstools/metadata.xml                   |  1 +
 dev-python/vncdotool/metadata.xml                  |  3 ++
 dev-python/webassets/metadata.xml                  | 15 +++---
 dev-python/websockets/metadata.xml                 |  1 +
 dev-python/ws4py/metadata.xml                      | 23 +++++----
 dev-python/wxpython/metadata.xml                   |  1 +
 dev-python/xdoctest/metadata.xml                   |  4 +-
 dev-python/yapf/metadata.xml                       |  7 ++-
 dev-python/yapsy/metadata.xml                      |  1 +
 dev-python/zVMCloudConnector/metadata.xml          |  3 ++
 dev-python/zxcvbn/metadata.xml                     |  3 ++
 260 files changed, 1233 insertions(+), 692 deletions(-)

diff --git a/dev-python/PyGithub/metadata.xml b/dev-python/PyGithub/metadata.xml
index 5a8ef9e1446..58457912661 100644
--- a/dev-python/PyGithub/metadata.xml
+++ b/dev-python/PyGithub/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">PyGithub/PyGithub</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">PyGithub/PyGithub</remote-id>
+		<remote-id type="pypi">PyGithub</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/PyUtilib/metadata.xml b/dev-python/PyUtilib/metadata.xml
index 2541628cf9a..bebb51bfe31 100644
--- a/dev-python/PyUtilib/metadata.xml
+++ b/dev-python/PyUtilib/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyUtilib</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/absl-py/metadata.xml b/dev-python/absl-py/metadata.xml
index 56c13a3fb08..c3e51968a4b 100644
--- a/dev-python/absl-py/metadata.xml
+++ b/dev-python/absl-py/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">abseil/abseil-py</remote-id>
+		<remote-id type="pypi">absl-py</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/aiofiles/metadata.xml b/dev-python/aiofiles/metadata.xml
index 83d73c6d0c0..f316a59679f 100644
--- a/dev-python/aiofiles/metadata.xml
+++ b/dev-python/aiofiles/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<remote-id type="github">Tinche/aiofiles</remote-id>
 		<bugs-to>https://github.com/Tinche/aiofiles/issues</bugs-to>
+		<remote-id type="pypi">aiofiles</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/aiohttp-cors/metadata.xml b/dev-python/aiohttp-cors/metadata.xml
index a00e54b3e81..7e698af58c3 100644
--- a/dev-python/aiohttp-cors/metadata.xml
+++ b/dev-python/aiohttp-cors/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aio-libs/aiohttp-cors</remote-id>
+		<remote-id type="pypi">aiohttp_cors</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/alagitpull/metadata.xml b/dev-python/alagitpull/metadata.xml
index a50ee0d4332..0fee98a872c 100644
--- a/dev-python/alagitpull/metadata.xml
+++ b/dev-python/alagitpull/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">alagitpull</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/anyqt/metadata.xml b/dev-python/anyqt/metadata.xml
index f728eac91cc..faf1290a546 100644
--- a/dev-python/anyqt/metadata.xml
+++ b/dev-python/anyqt/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">AnyQt</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/apsw/metadata.xml b/dev-python/apsw/metadata.xml
index bd25419f617..061ddc25aaa 100644
--- a/dev-python/apsw/metadata.xml
+++ b/dev-python/apsw/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    APSW provides an SQLite 3 wrapper that provides the thinnest layer over SQLite 3 possible.
-    Everything you can do from the C API to SQLite 3, you can do from Python.
-    Although APSW looks vaguely similar to the DBAPI, it is not compliant with that API and instead
-    works the way SQLite 3 does.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">rogerbinns/apsw</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		APSW provides an SQLite 3 wrapper that provides the thinnest layer over SQLite 3 possible.
+		Everything you can do from the C API to SQLite 3, you can do from Python.
+		Although APSW looks vaguely similar to the DBAPI, it is not compliant with that API and instead
+		works the way SQLite 3 does.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">rogerbinns/apsw</remote-id>
+		<remote-id type="pypi">apsw</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/asteval/metadata.xml b/dev-python/asteval/metadata.xml
index 020b40648ee..15763d8b08c 100644
--- a/dev-python/asteval/metadata.xml
+++ b/dev-python/asteval/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">asteval</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/astunparse/metadata.xml b/dev-python/astunparse/metadata.xml
index c36c37139fa..3450c7499fe 100644
--- a/dev-python/astunparse/metadata.xml
+++ b/dev-python/astunparse/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">astunparse</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/authheaders/metadata.xml b/dev-python/authheaders/metadata.xml
index 3ee70120def..d7a8404dd95 100644
--- a/dev-python/authheaders/metadata.xml
+++ b/dev-python/authheaders/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">authheaders</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/backports-zoneinfo/metadata.xml b/dev-python/backports-zoneinfo/metadata.xml
index 266e3f19ca5..e70c1de18f0 100644
--- a/dev-python/backports-zoneinfo/metadata.xml
+++ b/dev-python/backports-zoneinfo/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">backports.zoneinfo</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/betamax-matchers/metadata.xml b/dev-python/betamax-matchers/metadata.xml
index 352b038b3bc..41aba4e4074 100644
--- a/dev-python/betamax-matchers/metadata.xml
+++ b/dev-python/betamax-matchers/metadata.xml
@@ -7,4 +7,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">betamax-matchers</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/betamax/metadata.xml b/dev-python/betamax/metadata.xml
index e59516686a4..4e5aae36e56 100644
--- a/dev-python/betamax/metadata.xml
+++ b/dev-python/betamax/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">betamax</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/bibtexparser/metadata.xml b/dev-python/bibtexparser/metadata.xml
index 30d601c0f42..049a994b028 100644
--- a/dev-python/bibtexparser/metadata.xml
+++ b/dev-python/bibtexparser/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">sciunto-org/python-bibtexparser</remote-id>
+		<remote-id type="pypi">bibtexparser</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/bitstring/metadata.xml b/dev-python/bitstring/metadata.xml
index 1248de8cc91..816bbf70b81 100644
--- a/dev-python/bitstring/metadata.xml
+++ b/dev-python/bitstring/metadata.xml
@@ -18,5 +18,6 @@
 	<upstream>
 		<remote-id type="google-code">python-bitstring</remote-id>
 		<remote-id type="github">scott-griffiths/bitstring</remote-id>
+		<remote-id type="pypi">bitstring</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/black/metadata.xml b/dev-python/black/metadata.xml
index 56cae167d37..e9851f2e412 100644
--- a/dev-python/black/metadata.xml
+++ b/dev-python/black/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">black</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/blurb/metadata.xml b/dev-python/blurb/metadata.xml
index a68165db0ed..7c2d3fa7575 100644
--- a/dev-python/blurb/metadata.xml
+++ b/dev-python/blurb/metadata.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <longdescription lang="en">
-    blurb is a tool designed to rid CPython core development of the scourge of
-    Misc/NEWS conflicts.
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<longdescription lang="en">
+		blurb is a tool designed to rid CPython core development of the scourge of
+		Misc/NEWS conflicts.
 
-    The core concept: split Misc/NEWS into many separate files that, when
-    concatenated back together in sorted order, reconstitute the original
-    Misc/NEWS file. After that, Misc/NEWS could be deleted from the CPython
-    repo and thereafter rendered on demand (e.g. when building a release).
-    When checking in a change to CPython, the checkin process will write
-    out a new file that sorts into the correct place, using a filename
-    unlikely to have a merge conflict.
-  </longdescription>
+		The core concept: split Misc/NEWS into many separate files that, when
+		concatenated back together in sorted order, reconstitute the original
+		Misc/NEWS file. After that, Misc/NEWS could be deleted from the CPython
+		repo and thereafter rendered on demand (e.g. when building a release).
+		When checking in a change to CPython, the checkin process will write
+		out a new file that sorts into the correct place, using a filename
+		unlikely to have a merge conflict.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">blurb</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/booleanOperations/metadata.xml b/dev-python/booleanOperations/metadata.xml
index 3da97a9953c..53c77afd462 100644
--- a/dev-python/booleanOperations/metadata.xml
+++ b/dev-python/booleanOperations/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">booleanOperations</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/boto3/metadata.xml b/dev-python/boto3/metadata.xml
index 54ceb365c5f..fc2e23c4ec3 100644
--- a/dev-python/boto3/metadata.xml
+++ b/dev-python/boto3/metadata.xml
@@ -20,5 +20,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">boto/boto3</remote-id>
+		<remote-id type="pypi">boto3</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/brython/metadata.xml b/dev-python/brython/metadata.xml
index 36e30a512a1..f2bfcdca568 100644
--- a/dev-python/brython/metadata.xml
+++ b/dev-python/brython/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-    <name>Patrice Clement</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">brython-dev/brython</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">brython-dev/brython</remote-id>
+		<remote-id type="pypi">brython</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/cangjie/metadata.xml b/dev-python/cangjie/metadata.xml
index 5249303a03c..765da01d5bf 100644
--- a/dev-python/cangjie/metadata.xml
+++ b/dev-python/cangjie/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">Cangjians/pycangjie</remote-id>
+		<remote-id type="pypi">CangJie</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/casttube/metadata.xml b/dev-python/casttube/metadata.xml
index 3ee70120def..3672312509f 100644
--- a/dev-python/casttube/metadata.xml
+++ b/dev-python/casttube/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">casttube</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/catkin_pkg/metadata.xml b/dev-python/catkin_pkg/metadata.xml
index 23a93212013..3be7e345ed2 100644
--- a/dev-python/catkin_pkg/metadata.xml
+++ b/dev-python/catkin_pkg/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">ros-infrastructure/catkin_pkg</remote-id>
+		<remote-id type="pypi">catkin-pkg</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/cgroup-utils/metadata.xml b/dev-python/cgroup-utils/metadata.xml
index e4905993c02..6e335f41f8c 100644
--- a/dev-python/cgroup-utils/metadata.xml
+++ b/dev-python/cgroup-utils/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">peo3/cgroup-utils</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">peo3/cgroup-utils</remote-id>
+		<remote-id type="pypi">cgroup-utils</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/cjkwrap/metadata.xml b/dev-python/cjkwrap/metadata.xml
index 6b0a0fb3a72..07822b67318 100644
--- a/dev-python/cjkwrap/metadata.xml
+++ b/dev-python/cjkwrap/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">CJKwrap</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/cli_helpers/metadata.xml b/dev-python/cli_helpers/metadata.xml
index ad9e3e04b43..b7e9e25a051 100644
--- a/dev-python/cli_helpers/metadata.xml
+++ b/dev-python/cli_helpers/metadata.xml
@@ -10,5 +10,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">dbcli/cli_helpers</remote-id>
+		<remote-id type="pypi">cli-helpers</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/confuse/metadata.xml b/dev-python/confuse/metadata.xml
index 30a66ee8e06..0f6926bfc34 100644
--- a/dev-python/confuse/metadata.xml
+++ b/dev-python/confuse/metadata.xml
@@ -16,5 +16,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">beetbox/confuse</remote-id>
+		<remote-id type="pypi">confuse</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/consonance/metadata.xml b/dev-python/consonance/metadata.xml
index 185f266d7db..c701381ea1c 100644
--- a/dev-python/consonance/metadata.xml
+++ b/dev-python/consonance/metadata.xml
@@ -13,5 +13,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/consonance/issues</bugs-to>
 		<remote-id type="github">tgalal/consonance</remote-id>
+		<remote-id type="pypi">consonance</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/coreapi/metadata.xml b/dev-python/coreapi/metadata.xml
index c36c37139fa..dcf00dccb5e 100644
--- a/dev-python/coreapi/metadata.xml
+++ b/dev-python/coreapi/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">coreapi</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/coreschema/metadata.xml b/dev-python/coreschema/metadata.xml
index c36c37139fa..187eee7c789 100644
--- a/dev-python/coreschema/metadata.xml
+++ b/dev-python/coreschema/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">coreschema</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/crcmod/metadata.xml b/dev-python/crcmod/metadata.xml
index 1ca4db94640..4ce1ace987c 100644
--- a/dev-python/crcmod/metadata.xml
+++ b/dev-python/crcmod/metadata.xml
@@ -13,5 +13,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">crcmod</remote-id>
+		<remote-id type="pypi">crcmod</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ctypescrypto/metadata.xml b/dev-python/ctypescrypto/metadata.xml
index db19a33dccc..aa7795ba5ec 100644
--- a/dev-python/ctypescrypto/metadata.xml
+++ b/dev-python/ctypescrypto/metadata.xml
@@ -10,5 +10,8 @@
 	</maintainer>
 	<use>
 		<flag name="gost">Build with support for GOST Message Authentication Code</flag>
-	</use>	
+	</use>
+	<upstream>
+		<remote-id type="pypi">ctypescrypto</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ctypesgen/metadata.xml b/dev-python/ctypesgen/metadata.xml
index 64f7f4e7715..9d0eeacbd60 100644
--- a/dev-python/ctypesgen/metadata.xml
+++ b/dev-python/ctypesgen/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">davidjamesca/ctypesgen</remote-id>
+		<remote-id type="pypi">ctypesgen</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/cvxopt/metadata.xml b/dev-python/cvxopt/metadata.xml
index 73822eb2153..d8071e3a6fb 100644
--- a/dev-python/cvxopt/metadata.xml
+++ b/dev-python/cvxopt/metadata.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  CVXOPT is a software for convex optimization based on
-  the Python programming language. Its main purpose is to make the
-  development of software for convex optimization applications
-  straightforward.
-</longdescription>
-  <use>
-    <flag name="dsdp">Use interior point library
-  <pkg>sci-libs/dsdp</pkg></flag>
-    <flag name="glpk">Use GNU Linear Programming Kit
-  <pkg>sci-mathematics/glpk</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">cvxopt/cvxopt</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		CVXOPT is a software for convex optimization based on
+		the Python programming language. Its main purpose is to make the
+		development of software for convex optimization applications
+		straightforward.
+	</longdescription>
+	<use>
+		<flag name="dsdp">Use interior point library
+			<pkg>sci-libs/dsdp</pkg></flag>
+		<flag name="glpk">Use GNU Linear Programming Kit
+			<pkg>sci-mathematics/glpk</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cvxopt/cvxopt</remote-id>
+		<remote-id type="pypi">cvxopt</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/dbus-python/metadata.xml b/dev-python/dbus-python/metadata.xml
index 5bb287759c5..7f259815616 100644
--- a/dev-python/dbus-python/metadata.xml
+++ b/dev-python/dbus-python/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>freedesktop-bugs@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>freedesktop-bugs@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">dbus-python</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/dbusmock/metadata.xml b/dev-python/dbusmock/metadata.xml
index 996e7cacd21..598247402a9 100644
--- a/dev-python/dbusmock/metadata.xml
+++ b/dev-python/dbusmock/metadata.xml
@@ -5,4 +5,7 @@
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-dbusmock</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/deprecated/metadata.xml b/dev-python/deprecated/metadata.xml
index e59516686a4..9e1c60a102f 100644
--- a/dev-python/deprecated/metadata.xml
+++ b/dev-python/deprecated/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Deprecated</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/dissononce/metadata.xml b/dev-python/dissononce/metadata.xml
index 394038dd3ab..71c2d8b79b8 100644
--- a/dev-python/dissononce/metadata.xml
+++ b/dev-python/dissononce/metadata.xml
@@ -14,5 +14,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/dissononce/issues</bugs-to>
 		<remote-id type="github">tgalal/dissononce</remote-id>
+		<remote-id type="pypi">dissononce</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-cacheops/metadata.xml b/dev-python/django-cacheops/metadata.xml
index 5d3d9dc0e2a..17ae2620bcc 100644
--- a/dev-python/django-cacheops/metadata.xml
+++ b/dev-python/django-cacheops/metadata.xml
@@ -8,4 +8,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-cacheops</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-filter/metadata.xml b/dev-python/django-filter/metadata.xml
index c36c37139fa..94af350f226 100644
--- a/dev-python/django-filter/metadata.xml
+++ b/dev-python/django-filter/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-filter</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-js-asset/metadata.xml b/dev-python/django-js-asset/metadata.xml
index c36c37139fa..1aca95d47fd 100644
--- a/dev-python/django-js-asset/metadata.xml
+++ b/dev-python/django-js-asset/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-js-asset</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
index c36c37139fa..515395136cd 100644
--- a/dev-python/django-mptt/metadata.xml
+++ b/dev-python/django-mptt/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-mptt</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-pglocks/metadata.xml b/dev-python/django-pglocks/metadata.xml
index c36c37139fa..00fa937a6b3 100644
--- a/dev-python/django-pglocks/metadata.xml
+++ b/dev-python/django-pglocks/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-pglocks</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-prometheus/metadata.xml b/dev-python/django-prometheus/metadata.xml
index c36c37139fa..b4bca3123fc 100644
--- a/dev-python/django-prometheus/metadata.xml
+++ b/dev-python/django-prometheus/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-prometheus</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-rq/metadata.xml b/dev-python/django-rq/metadata.xml
index c36c37139fa..14eafe988a3 100644
--- a/dev-python/django-rq/metadata.xml
+++ b/dev-python/django-rq/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-rq</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-taggit-serializer/metadata.xml b/dev-python/django-taggit-serializer/metadata.xml
index c36c37139fa..c9b586832af 100644
--- a/dev-python/django-taggit-serializer/metadata.xml
+++ b/dev-python/django-taggit-serializer/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-taggit-serializer</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-taggit/metadata.xml b/dev-python/django-taggit/metadata.xml
index c36c37139fa..5cbf891ae81 100644
--- a/dev-python/django-taggit/metadata.xml
+++ b/dev-python/django-taggit/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-taggit</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/django-timezone-field/metadata.xml b/dev-python/django-timezone-field/metadata.xml
index c36c37139fa..46a2959005e 100644
--- a/dev-python/django-timezone-field/metadata.xml
+++ b/dev-python/django-timezone-field/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">django-timezone-field</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/djangorestframework/metadata.xml b/dev-python/djangorestframework/metadata.xml
index c36c37139fa..6650f6a06ae 100644
--- a/dev-python/djangorestframework/metadata.xml
+++ b/dev-python/djangorestframework/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">djangorestframework</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/docker-py/metadata.xml b/dev-python/docker-py/metadata.xml
index 9862fd2de42..da5cbb29397 100644
--- a/dev-python/docker-py/metadata.xml
+++ b/dev-python/docker-py/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">docker/docker-py</remote-id>
-    <bugs-to>https://github.com/docker/docker-py/issues</bugs-to>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">docker/docker-py</remote-id>
+		<bugs-to>https://github.com/docker/docker-py/issues</bugs-to>
+		<remote-id type="pypi">docker-py</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/dockerpty/metadata.xml b/dev-python/dockerpty/metadata.xml
index a46f63a01b2..3546f36224a 100644
--- a/dev-python/dockerpty/metadata.xml
+++ b/dev-python/dockerpty/metadata.xml
@@ -4,5 +4,6 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">d11wtq/dockerpty</remote-id>
+		<remote-id type="pypi">dockerpty</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/docutils-glep/metadata.xml b/dev-python/docutils-glep/metadata.xml
index 3136117dc03..15e6fc74668 100644
--- a/dev-python/docutils-glep/metadata.xml
+++ b/dev-python/docutils-glep/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">docutils-glep</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/doublex-expects/metadata.xml b/dev-python/doublex-expects/metadata.xml
index 2a41f4498fe..30114c42b2c 100644
--- a/dev-python/doublex-expects/metadata.xml
+++ b/dev-python/doublex-expects/metadata.xml
@@ -4,5 +4,6 @@
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">jaimegildesagredo/doublex-expects</remote-id>
+		<remote-id type="pypi">doublex-expects</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
index d162bd623ca..4a091e4f1cf 100644
--- a/dev-python/drf-yasg/metadata.xml
+++ b/dev-python/drf-yasg/metadata.xml
@@ -10,4 +10,7 @@
 			Enable swagger spec validation using swagger-spec-validator
 		</flag>
 	</use>
+	<upstream>
+		<remote-id type="pypi">drf-yasg</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/duecredit/metadata.xml b/dev-python/duecredit/metadata.xml
index 4da5669f0f1..91a1ddc6820 100644
--- a/dev-python/duecredit/metadata.xml
+++ b/dev-python/duecredit/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">duecredit/duecredit</remote-id>
+		<remote-id type="pypi">duecredit</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/easyprocess/metadata.xml b/dev-python/easyprocess/metadata.xml
index d22e99d7357..987795a6511 100644
--- a/dev-python/easyprocess/metadata.xml
+++ b/dev-python/easyprocess/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">EasyProcess</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ebuildtester/metadata.xml b/dev-python/ebuildtester/metadata.xml
index 3622a638273..17fead7d2c1 100644
--- a/dev-python/ebuildtester/metadata.xml
+++ b/dev-python/ebuildtester/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>nicolasbock@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ebuildtester</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/editorconfig-core-py/metadata.xml b/dev-python/editorconfig-core-py/metadata.xml
index 53919fa6929..3a66b57dd84 100644
--- a/dev-python/editorconfig-core-py/metadata.xml
+++ b/dev-python/editorconfig-core-py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -15,5 +15,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">editorconfig/editorconfig-core-test</remote-id>
+		<remote-id type="pypi">EditorConfig</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/empy/metadata.xml b/dev-python/empy/metadata.xml
index 4c43a15ce6f..a0ad3988147 100644
--- a/dev-python/empy/metadata.xml
+++ b/dev-python/empy/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">empy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/entrypoint2/metadata.xml b/dev-python/entrypoint2/metadata.xml
index c12ae293d46..ba153c9918f 100644
--- a/dev-python/entrypoint2/metadata.xml
+++ b/dev-python/entrypoint2/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">entrypoint2</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/exam/metadata.xml b/dev-python/exam/metadata.xml
index e782094b1d2..6a0cf120810 100644
--- a/dev-python/exam/metadata.xml
+++ b/dev-python/exam/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@gmail.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">fluxx/exam</remote-id>
-  </upstream>
-  <longdescription lang="en">
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">fluxx/exam</remote-id>
+		<remote-id type="pypi">exam</remote-id>
+	</upstream>
+	<longdescription lang="en">
 Exam is a Python toolkit for writing better tests. It aims to remove a lot of the boiler plate testing code one often writes, while still following Python conventions and adhering to the unit testing interface.
 
 Aside from the obvious "does the code work?", writings tests has many additional goals and benefits:
@@ -24,5 +25,5 @@ Aside from the obvious "does the code work?", writings tests has many additional
 Unfortunately, the common pattern for writing Python unit tests tends to not offer any of these advantages. Often times results in inefficient and unnecessarily obtuse testing code. Additionally, common uses of the mock library can often result in repetitive boiler-plate code or inefficiency during test runs.
 
 exam aims to improve the state of Python test writing by providing a toolkit of useful functionality to make writing quick, correct and useful tests and as painless as possible.
-  </longdescription>
+	</longdescription>
 </pkgmetadata>

diff --git a/dev-python/eyeD3/metadata.xml b/dev-python/eyeD3/metadata.xml
index d0913ee5d1c..0f50ed7380b 100644
--- a/dev-python/eyeD3/metadata.xml
+++ b/dev-python/eyeD3/metadata.xml
@@ -5,8 +5,11 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-<maintainer type="project">
+	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">eyeD3</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/fastjsonschema/metadata.xml b/dev-python/fastjsonschema/metadata.xml
index 266e3f19ca5..b22752a6895 100644
--- a/dev-python/fastjsonschema/metadata.xml
+++ b/dev-python/fastjsonschema/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fastjsonschema</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/fido2/metadata.xml b/dev-python/fido2/metadata.xml
index c9ccdc3b158..3ebed6d78bf 100644
--- a/dev-python/fido2/metadata.xml
+++ b/dev-python/fido2/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>gokturk@gentoo.org</email>
-  <name>Göktürk Yüksek</name>
-</maintainer>
-<longdescription>
-  fido2 provides library functionality for communicating with a FIDO
-  device over USB as well as verifying attestation and assertion
-  signatures.
-</longdescription>
-<stabilize-allarches/>
-<upstream>
-  <remote-id type="github">Yubico/python-fido2</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>gokturk@gentoo.org</email>
+		<name>Göktürk Yüksek</name>
+	</maintainer>
+	<longdescription>
+		fido2 provides library functionality for communicating with a FIDO
+		device over USB as well as verifying attestation and assertion
+		signatures.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">Yubico/python-fido2</remote-id>
+		<remote-id type="pypi">fido2</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/fields/metadata.xml b/dev-python/fields/metadata.xml
index 4391ab4e39c..bad4b18882f 100644
--- a/dev-python/fields/metadata.xml
+++ b/dev-python/fields/metadata.xml
@@ -1,12 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">ionelmc/python-fields</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">ionelmc/python-fields</remote-id>
+		<remote-id type="pypi">fields</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/findimports/metadata.xml b/dev-python/findimports/metadata.xml
index 0319eec4c8b..7f668de4daa 100644
--- a/dev-python/findimports/metadata.xml
+++ b/dev-python/findimports/metadata.xml
@@ -5,4 +5,7 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">findimports</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/fitsio/metadata.xml b/dev-python/fitsio/metadata.xml
index b7f5bc4ce9a..c8e0769187f 100644
--- a/dev-python/fitsio/metadata.xml
+++ b/dev-python/fitsio/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-astronomy@gentoo.org</email>
-    <name>Gentoo Astronomy Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Fitsio provides an easy to use object-oriented API including
-    providing a Numpy interface to FITS files read from CFITSIO. It
-    allows direct access to the columns of a FITS binary table which can
-    be useful for reading large fits files. Compared to astropy.io.fits,
-    this package is closer to the underlying cfitsio library.
-    Fitsio also exposes a microlanguage (implemented in CFITSIO) for
-    making efficient SQL-like queries of tables (single tables only
-    though–no joins or anything like that).
-  </longdescription>
-  <upstream>
-    <remote-id type="github">esheldon/fitsio</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci-astronomy@gentoo.org</email>
+		<name>Gentoo Astronomy Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Fitsio provides an easy to use object-oriented API including
+		providing a Numpy interface to FITS files read from CFITSIO. It
+		allows direct access to the columns of a FITS binary table which can
+		be useful for reading large fits files. Compared to astropy.io.fits,
+		this package is closer to the underlying cfitsio library.
+		Fitsio also exposes a microlanguage (implemented in CFITSIO) for
+		making efficient SQL-like queries of tables (single tables only
+		though–no joins or anything like that).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">esheldon/fitsio</remote-id>
+		<remote-id type="pypi">fitsio</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flask-assets/metadata.xml b/dev-python/flask-assets/metadata.xml
index 4e3e7057575..804f01c4ec0 100644
--- a/dev-python/flask-assets/metadata.xml
+++ b/dev-python/flask-assets/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">miracle2k/flask-assets</remote-id>
+		<remote-id type="pypi">Flask-Assets</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flask-paginate/metadata.xml b/dev-python/flask-paginate/metadata.xml
index 35a30be0a27..e0b79d552b4 100644
--- a/dev-python/flask-paginate/metadata.xml
+++ b/dev-python/flask-paginate/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <maintainer type="person">
-        <email>davidroman96@gmail.com</email>
-        <name>David Roman</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>python@gentoo.org</email>
-        <name>Python</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">lixxu/flask-paginate</remote-id>
-    </upstream>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lixxu/flask-paginate</remote-id>
+		<remote-id type="pypi">flask-paginate</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/fleep/metadata.xml b/dev-python/fleep/metadata.xml
index c8ab1000c5b..9e666fde371 100644
--- a/dev-python/fleep/metadata.xml
+++ b/dev-python/fleep/metadata.xml
@@ -8,4 +8,7 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">fleep</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flufl-bounce/metadata.xml b/dev-python/flufl-bounce/metadata.xml
index 3ee70120def..dc01cb742b0 100644
--- a/dev-python/flufl-bounce/metadata.xml
+++ b/dev-python/flufl-bounce/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flufl.bounce</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flufl-i18n/metadata.xml b/dev-python/flufl-i18n/metadata.xml
index 3ee70120def..043b994e6a2 100644
--- a/dev-python/flufl-i18n/metadata.xml
+++ b/dev-python/flufl-i18n/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flufl.i18n</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/flufl-lock/metadata.xml b/dev-python/flufl-lock/metadata.xml
index 3ee70120def..24259133e15 100644
--- a/dev-python/flufl-lock/metadata.xml
+++ b/dev-python/flufl-lock/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flufl.lock</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index c5af3a50bbc..2abce01d1b3 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -12,5 +12,6 @@
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">fonttools/fonttools</remote-id>
+		<remote-id type="pypi">fonttools</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/funcy/metadata.xml b/dev-python/funcy/metadata.xml
index d0e866f244f..4484fa7a80e 100644
--- a/dev-python/funcy/metadata.xml
+++ b/dev-python/funcy/metadata.xml
@@ -5,4 +5,7 @@
 		<email>tupone@gentoo.org</email>
 		<name>Tupone Alfredo</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">funcy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/fuse-python/metadata.xml b/dev-python/fuse-python/metadata.xml
index 514528075df..eed99a0e5ab 100644
--- a/dev-python/fuse-python/metadata.xml
+++ b/dev-python/fuse-python/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fuse</remote-id>
+		<remote-id type="pypi">fuse-python</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/github3/metadata.xml b/dev-python/github3/metadata.xml
index 556e313bfbe..820467f6245 100644
--- a/dev-python/github3/metadata.xml
+++ b/dev-python/github3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -14,5 +14,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">sigmavirus24/github3.py</remote-id>
+		<remote-id type="pypi">github3.py</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/google-api-core/metadata.xml b/dev-python/google-api-core/metadata.xml
index a50ee0d4332..8d2a3f04ef2 100644
--- a/dev-python/google-api-core/metadata.xml
+++ b/dev-python/google-api-core/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">google-api-core</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/google-apitools/metadata.xml b/dev-python/google-apitools/metadata.xml
index 8caccea78d8..4293947c613 100644
--- a/dev-python/google-apitools/metadata.xml
+++ b/dev-python/google-apitools/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">google/apitools</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">google/apitools</remote-id>
+		<remote-id type="pypi">google-apitools</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/graph-tool/metadata.xml b/dev-python/graph-tool/metadata.xml
index 9718da9a7a9..693dc1a8e74 100644
--- a/dev-python/graph-tool/metadata.xml
+++ b/dev-python/graph-tool/metadata.xml
@@ -9,4 +9,7 @@
 		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">graph-tool</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/gsd/metadata.xml b/dev-python/gsd/metadata.xml
index b68a232b6ca..99d3a572301 100644
--- a/dev-python/gsd/metadata.xml
+++ b/dev-python/gsd/metadata.xml
@@ -9,4 +9,7 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">gsd</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/gst-python/metadata.xml b/dev-python/gst-python/metadata.xml
index af143d8096c..42b76fdc5c1 100644
--- a/dev-python/gst-python/metadata.xml
+++ b/dev-python/gst-python/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gstreamer@gentoo.org</email>
-    <name>GStreamer package maintainers</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>gstreamer@gentoo.org</email>
+		<name>GStreamer package maintainers</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-python/hcloud-python/metadata.xml b/dev-python/hcloud-python/metadata.xml
index 7520bcc3afb..31093cd149c 100644
--- a/dev-python/hcloud-python/metadata.xml
+++ b/dev-python/hcloud-python/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ago@gentoo.org</email>
-    <name>Agostino Sarubbo</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hetznercloud/hcloud-python</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ago@gentoo.org</email>
+		<name>Agostino Sarubbo</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">hetznercloud/hcloud-python</remote-id>
+		<remote-id type="pypi">hcloud</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/helpdev/metadata.xml b/dev-python/helpdev/metadata.xml
index dd0bd9c021f..27e26cd85d0 100644
--- a/dev-python/helpdev/metadata.xml
+++ b/dev-python/helpdev/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">helpdev</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/httmock/metadata.xml b/dev-python/httmock/metadata.xml
index 459fa77374f..c9f39894715 100644
--- a/dev-python/httmock/metadata.xml
+++ b/dev-python/httmock/metadata.xml
@@ -4,5 +4,6 @@
 	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">patrys/httmock</remote-id>
+		<remote-id type="pypi">httmock</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/httpstat/metadata.xml b/dev-python/httpstat/metadata.xml
index 2dcc864feab..6a6902f9156 100644
--- a/dev-python/httpstat/metadata.xml
+++ b/dev-python/httpstat/metadata.xml
@@ -8,5 +8,6 @@
 	<upstream>
 		<bugs-to>https://github.com/reorx/httpstat/issues</bugs-to>
 		<remote-id type="github">reorx/httpstat</remote-id>
+		<remote-id type="pypi">httpstat</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ifaddr/metadata.xml b/dev-python/ifaddr/metadata.xml
index 3ee70120def..a9f519e2628 100644
--- a/dev-python/ifaddr/metadata.xml
+++ b/dev-python/ifaddr/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ifaddr</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/imageio/metadata.xml b/dev-python/imageio/metadata.xml
index a698d92e553..47a765c2f28 100644
--- a/dev-python/imageio/metadata.xml
+++ b/dev-python/imageio/metadata.xml
@@ -17,5 +17,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">imageio/imageio</remote-id>
+		<remote-id type="pypi">imageio</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/iniconfig/metadata.xml b/dev-python/iniconfig/metadata.xml
index 266e3f19ca5..7b11afae1bb 100644
--- a/dev-python/iniconfig/metadata.xml
+++ b/dev-python/iniconfig/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">iniconfig</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ioflo/metadata.xml b/dev-python/ioflo/metadata.xml
index 3273120e4e7..e648c6f51e3 100644
--- a/dev-python/ioflo/metadata.xml
+++ b/dev-python/ioflo/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ioflo/ioflo</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ioflo/ioflo</remote-id>
+		<remote-id type="pypi">ioflo</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/jaraco-context/metadata.xml b/dev-python/jaraco-context/metadata.xml
index 7f4f33c6dbc..1450a0c4f11 100644
--- a/dev-python/jaraco-context/metadata.xml
+++ b/dev-python/jaraco-context/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jaraco.context</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/jsonext/metadata.xml b/dev-python/jsonext/metadata.xml
index 3ee70120def..909536b074c 100644
--- a/dev-python/jsonext/metadata.xml
+++ b/dev-python/jsonext/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">jsonext</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/jsonrpclib/metadata.xml b/dev-python/jsonrpclib/metadata.xml
index 1c7bba27c5d..db4bd215b0a 100644
--- a/dev-python/jsonrpclib/metadata.xml
+++ b/dev-python/jsonrpclib/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">tcalmant/jsonrpclib</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">tcalmant/jsonrpclib</remote-id>
+		<remote-id type="pypi">jsonrpclib</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/jupyterlab_pygments/metadata.xml b/dev-python/jupyterlab_pygments/metadata.xml
index f97ba7497b1..704b86b0536 100644
--- a/dev-python/jupyterlab_pygments/metadata.xml
+++ b/dev-python/jupyterlab_pygments/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <description>Python</description>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">jupyterlab/jupyterlab_pygments</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<description>Python</description>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">jupyterlab/jupyterlab_pygments</remote-id>
+		<remote-id type="pypi">jupyterlab-pygments</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/kaptan/metadata.xml b/dev-python/kaptan/metadata.xml
index 56cae167d37..c0014ed738b 100644
--- a/dev-python/kaptan/metadata.xml
+++ b/dev-python/kaptan/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">kaptan</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/lazr-config/metadata.xml b/dev-python/lazr-config/metadata.xml
index 3ee70120def..6edd3801988 100644
--- a/dev-python/lazr-config/metadata.xml
+++ b/dev-python/lazr-config/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lazr.config</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/lcdproc/metadata.xml b/dev-python/lcdproc/metadata.xml
index e62d5c1a6a0..7be5fe20082 100644
--- a/dev-python/lcdproc/metadata.xml
+++ b/dev-python/lcdproc/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<bugs-to>https://github.com/jinglemansweep/lcdproc/issues</bugs-to>
 		<remote-id type="github">jinglemansweep/lcdproc</remote-id>
+		<remote-id type="pypi">lcdproc</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/libpy_simdjson/metadata.xml b/dev-python/libpy_simdjson/metadata.xml
index cee379b1540..a2b84c6311a 100644
--- a/dev-python/libpy_simdjson/metadata.xml
+++ b/dev-python/libpy_simdjson/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libpy-simdjson</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
index dd0bd9c021f..2bcd0001e9b 100644
--- a/dev-python/libsass/metadata.xml
+++ b/dev-python/libsass/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libsass</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/libtmux/metadata.xml b/dev-python/libtmux/metadata.xml
index 56cae167d37..f8886f632e5 100644
--- a/dev-python/libtmux/metadata.xml
+++ b/dev-python/libtmux/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libtmux</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/lit/metadata.xml b/dev-python/lit/metadata.xml
index 89c4bdb9604..9f9e9cb580d 100644
--- a/dev-python/lit/metadata.xml
+++ b/dev-python/lit/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>llvm@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lit</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index 5a0914daffe..21b4756a086 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
+		<remote-id type="pypi">livereload</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/lmfit/metadata.xml b/dev-python/lmfit/metadata.xml
index 020b40648ee..3b1d3048e0a 100644
--- a/dev-python/lmfit/metadata.xml
+++ b/dev-python/lmfit/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="person">
 		<email>pacho@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">lmfit</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/loky/metadata.xml b/dev-python/loky/metadata.xml
index 266e3f19ca5..d826a22b20c 100644
--- a/dev-python/loky/metadata.xml
+++ b/dev-python/loky/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">loky</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/lunr/metadata.xml b/dev-python/lunr/metadata.xml
index 5a0914daffe..749310d9a90 100644
--- a/dev-python/lunr/metadata.xml
+++ b/dev-python/lunr/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
+		<remote-id type="pypi">lunr</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/matterhook/metadata.xml b/dev-python/matterhook/metadata.xml
index 4c76899f3ee..95c54986ef2 100644
--- a/dev-python/matterhook/metadata.xml
+++ b/dev-python/matterhook/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>ultrabug@gentoo.org</email>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">numberly/matterhook</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ultrabug@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">numberly/matterhook</remote-id>
+		<remote-id type="pypi">matterhook</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mdx_gh_links/metadata.xml b/dev-python/mdx_gh_links/metadata.xml
index d22e99d7357..ffb6095beaa 100644
--- a/dev-python/mdx_gh_links/metadata.xml
+++ b/dev-python/mdx_gh_links/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mdx_gh_links</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mecab-python/metadata.xml b/dev-python/mecab-python/metadata.xml
index 82adca0f7b8..0f7251470f3 100644
--- a/dev-python/mecab-python/metadata.xml
+++ b/dev-python/mecab-python/metadata.xml
@@ -9,5 +9,6 @@
 		<remote-id type="github">taku910/mecab</remote-id>
 		<remote-id type="google-code">mecab</remote-id>
 		<remote-id type="sourceforge">mecab</remote-id>
+		<remote-id type="pypi">mecab-python</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mechanize/metadata.xml b/dev-python/mechanize/metadata.xml
index cc33db8a685..b5b7f28a7b6 100644
--- a/dev-python/mechanize/metadata.xml
+++ b/dev-python/mechanize/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription lang="en">
-    mechanize is a Python module for static programmatic web browsing in
-    Python, after Andy Lester's Perl module WWW::Mechanize. With the Browser
-    subclass any url can be opened - not just http - and UserAgentBase
-    offers easy dynamic configuration of user-agent features like protocol,
-    cookie, redirection and robots.txt handling. Other functionalities
-    include easy HTML form filling using ClientForm interface, convenient
-    link parsing and following, browser history with .back() and .reload()
-    methods and automatic handling of HTTP-Equiv and Refresh.
-  </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">wwwsearch</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription lang="en">
+		mechanize is a Python module for static programmatic web browsing in
+		Python, after Andy Lester's Perl module WWW::Mechanize. With the Browser
+		subclass any url can be opened - not just http - and UserAgentBase
+		offers easy dynamic configuration of user-agent features like protocol,
+		cookie, redirection and robots.txt handling. Other functionalities
+		include easy HTML form filling using ClientForm interface, convenient
+		link parsing and following, browser history with .back() and .reload()
+		methods and automatic handling of HTTP-Equiv and Refresh.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">wwwsearch</remote-id>
+		<remote-id type="pypi">mechanize</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mediafile/metadata.xml b/dev-python/mediafile/metadata.xml
index 994b84bcc45..d1864821cd5 100644
--- a/dev-python/mediafile/metadata.xml
+++ b/dev-python/mediafile/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">beetbox/mediafile</remote-id>
+		<remote-id type="pypi">mediafile</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/micawber/metadata.xml b/dev-python/micawber/metadata.xml
index 740d13d5231..51ec6ca51d9 100644
--- a/dev-python/micawber/metadata.xml
+++ b/dev-python/micawber/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">coleifer/micawber</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">coleifer/micawber</remote-id>
+		<remote-id type="pypi">micawber</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/miniupnpc/metadata.xml b/dev-python/miniupnpc/metadata.xml
index 998965a402c..54d17516bff 100644
--- a/dev-python/miniupnpc/metadata.xml
+++ b/dev-python/miniupnpc/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>mgorny@gentoo.org</email>
-	<name>Michał Górny</name>
-</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">miniupnpc</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mmtf-python/metadata.xml b/dev-python/mmtf-python/metadata.xml
index e4904232b6f..8c129ea8bb2 100644
--- a/dev-python/mmtf-python/metadata.xml
+++ b/dev-python/mmtf-python/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">rcsb/mmtf-python</remote-id>
+		<remote-id type="pypi">mmtf-python</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mongoengine/metadata.xml b/dev-python/mongoengine/metadata.xml
index f96ee66ae8b..1fa49211b39 100644
--- a/dev-python/mongoengine/metadata.xml
+++ b/dev-python/mongoengine/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">MongoEngine/mongoengine</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MongoEngine/mongoengine</remote-id>
+		<remote-id type="pypi">mongoengine</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/moviepy/metadata.xml b/dev-python/moviepy/metadata.xml
index 2d8df503483..3168f6c9453 100644
--- a/dev-python/moviepy/metadata.xml
+++ b/dev-python/moviepy/metadata.xml
@@ -17,5 +17,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">Zulko/moviepy</remote-id>
+		<remote-id type="pypi">moviepy</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mpdlcd/metadata.xml b/dev-python/mpdlcd/metadata.xml
index 47a1342d704..cf6906910be 100644
--- a/dev-python/mpdlcd/metadata.xml
+++ b/dev-python/mpdlcd/metadata.xml
@@ -15,5 +15,6 @@
 	<upstream>
 		<bugs-to>https://github.com/rbarrois/mpdlcd/issues</bugs-to>
 		<remote-id type="github">rbarrois/mpdlcd</remote-id>
+		<remote-id type="pypi">mpdlcd</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mss/metadata.xml b/dev-python/mss/metadata.xml
index d22e99d7357..33e44966d1b 100644
--- a/dev-python/mss/metadata.xml
+++ b/dev-python/mss/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mss</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/multidict/metadata.xml b/dev-python/multidict/metadata.xml
index 3d66a95ddcf..73a1bb0ceb7 100644
--- a/dev-python/multidict/metadata.xml
+++ b/dev-python/multidict/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aio-libs/multidict</remote-id>
+		<remote-id type="pypi">multidict</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mygpoclient/metadata.xml b/dev-python/mygpoclient/metadata.xml
index 920281b72fb..20e1365b4c7 100644
--- a/dev-python/mygpoclient/metadata.xml
+++ b/dev-python/mygpoclient/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mygpoclient</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/mysql-connector-python/metadata.xml b/dev-python/mysql-connector-python/metadata.xml
index 5487ad62c5e..e0ade4ef344 100644
--- a/dev-python/mysql-connector-python/metadata.xml
+++ b/dev-python/mysql-connector-python/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>mysql-bugs@gentoo.org</email>
-	<name>MySQL</name>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
+	<maintainer type="project">
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">mysql-connector-python</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/neovim-remote/metadata.xml b/dev-python/neovim-remote/metadata.xml
index 0c432dd1d7b..847453aa122 100644
--- a/dev-python/neovim-remote/metadata.xml
+++ b/dev-python/neovim-remote/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">neovim-remote</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/nnpy/metadata.xml b/dev-python/nnpy/metadata.xml
index aa31df7c434..4ae30afb0f7 100644
--- a/dev-python/nnpy/metadata.xml
+++ b/dev-python/nnpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">nanomsg/nnpy</remote-id>
+		<remote-id type="pypi">nnpy</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/nodeenv/metadata.xml b/dev-python/nodeenv/metadata.xml
index 8df7ead50ee..bdb9e7f72df 100644
--- a/dev-python/nodeenv/metadata.xml
+++ b/dev-python/nodeenv/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>monsieurp@gentoo.org</email>
-        <name>Patrice Clement</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">ekalinin/nodeenv</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ekalinin/nodeenv</remote-id>
+		<remote-id type="pypi">nodeenv</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/nose2/metadata.xml b/dev-python/nose2/metadata.xml
index 684f51f4935..507e890c359 100644
--- a/dev-python/nose2/metadata.xml
+++ b/dev-python/nose2/metadata.xml
@@ -1,8 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">nose-devs/nose2</remote-id>
+		<remote-id type="pypi">nose2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/nuitka/metadata.xml b/dev-python/nuitka/metadata.xml
index 50c557ea474..1fe2db78734 100644
--- a/dev-python/nuitka/metadata.xml
+++ b/dev-python/nuitka/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<name>Oz Tiram</name>
-	<email>oz.tiram@gmail.com</email>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription lang="en">
-	Python compiler with full language support and CPython compatibility
-	This Python compiler achieves full language compatibility and compiles Python
-	code into compiled objects that are not second class at all. Instead they can
-	be used in the same way as pure Python objects.
-</longdescription>
-<upstream>
-	<remote-id type="github">Nuitka/Nuitka</remote-id>
-</upstream>
+	<maintainer type="person">
+		<name>Oz Tiram</name>
+		<email>oz.tiram@gmail.com</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		Python compiler with full language support and CPython compatibility
+		This Python compiler achieves full language compatibility and compiles Python
+		code into compiled objects that are not second class at all. Instead they can
+		be used in the same way as pure Python objects.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">Nuitka/Nuitka</remote-id>
+		<remote-id type="pypi">Nuitka</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/oauth2client/metadata.xml b/dev-python/oauth2client/metadata.xml
index 84013d57af4..28ef2528920 100644
--- a/dev-python/oauth2client/metadata.xml
+++ b/dev-python/oauth2client/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">googleapis/oauth2client</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">googleapis/oauth2client</remote-id>
+		<remote-id type="pypi">oauth2client</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/osrf_pycommon/metadata.xml b/dev-python/osrf_pycommon/metadata.xml
index b48cc9c2c50..e726c5a7400 100644
--- a/dev-python/osrf_pycommon/metadata.xml
+++ b/dev-python/osrf_pycommon/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">osrf/osrf_pycommon</remote-id>
+		<remote-id type="pypi">osrf-pycommon</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ovsdbapp/metadata.xml b/dev-python/ovsdbapp/metadata.xml
index 631e40d11e7..fcfaa55e751 100644
--- a/dev-python/ovsdbapp/metadata.xml
+++ b/dev-python/ovsdbapp/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">ovsdbapp</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/paho-mqtt/metadata.xml b/dev-python/paho-mqtt/metadata.xml
index d09bbcbb0d9..21bd771b338 100644
--- a/dev-python/paho-mqtt/metadata.xml
+++ b/dev-python/paho-mqtt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">eclipse/paho.mqtt.python</remote-id>
+		<remote-id type="pypi">paho-mqtt</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/parameterized/metadata.xml b/dev-python/parameterized/metadata.xml
index f728eac91cc..d0639ce03a3 100644
--- a/dev-python/parameterized/metadata.xml
+++ b/dev-python/parameterized/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">parameterized</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/parametrized/metadata.xml b/dev-python/parametrized/metadata.xml
index f728eac91cc..4ee04ac6121 100644
--- a/dev-python/parametrized/metadata.xml
+++ b/dev-python/parametrized/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>amynka@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">parametrized</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/peewee/metadata.xml b/dev-python/peewee/metadata.xml
index 739a565c310..a16d70d51ad 100644
--- a/dev-python/peewee/metadata.xml
+++ b/dev-python/peewee/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">coleifer/peewee</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">coleifer/peewee</remote-id>
+		<remote-id type="pypi">peewee</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index 8b85d401f4e..b02c554129a 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>andreacerisara@gmail.com</email>
-      <name>Andrea Cerisara</name>
-    </maintainer>
-    <maintainer type="project">
-      <email>proxy-maint@gentoo.org</email>
-      <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription>
-    PGSpecial provides an API to execute meta-commands
-    (AKA "special", or "backslash commands") on PostgreSQL.
-  </longdescription>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">dbcli/pgspecial</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>andreacerisara@gmail.com</email>
+		<name>Andrea Cerisara</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		PGSpecial provides an API to execute meta-commands
+		(AKA "special", or "backslash commands") on PostgreSQL.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">dbcli/pgspecial</remote-id>
+		<remote-id type="pypi">pgspecial</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/plyr/metadata.xml b/dev-python/plyr/metadata.xml
index 1a1144b87cb..c5c2e533b6c 100644
--- a/dev-python/plyr/metadata.xml
+++ b/dev-python/plyr/metadata.xml
@@ -4,8 +4,9 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
-		</maintainer>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">sahib/python-glyr</remote-id>
+		<remote-id type="pypi">plyr</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pocketlint/metadata.xml b/dev-python/pocketlint/metadata.xml
index 3b45e273367..3a2291f0bf1 100644
--- a/dev-python/pocketlint/metadata.xml
+++ b/dev-python/pocketlint/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rhinstaller/pocketlint</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">rhinstaller/pocketlint</remote-id>
+		<remote-id type="pypi">pocketlint</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/podcastparser/metadata.xml b/dev-python/podcastparser/metadata.xml
index 39626a990be..9330487cd7f 100644
--- a/dev-python/podcastparser/metadata.xml
+++ b/dev-python/podcastparser/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">podcastparser</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/polygon/metadata.xml b/dev-python/polygon/metadata.xml
index 9bc334c9538..d7d0469c0a7 100644
--- a/dev-python/polygon/metadata.xml
+++ b/dev-python/polygon/metadata.xml
@@ -10,4 +10,7 @@
 		Python bindings for gpc, the General Polygon Clipping Library by
 		Alan Murta and some extensions written in C and pure Python.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">Polygon</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pony/metadata.xml b/dev-python/pony/metadata.xml
index 266e3f19ca5..08494c170d2 100644
--- a/dev-python/pony/metadata.xml
+++ b/dev-python/pony/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pony</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/publicsuffix/metadata.xml b/dev-python/publicsuffix/metadata.xml
index 1de14ee2fdc..c604e58d98f 100644
--- a/dev-python/publicsuffix/metadata.xml
+++ b/dev-python/publicsuffix/metadata.xml
@@ -11,4 +11,7 @@
 	<longdescription lang="en">
 			This module allows you to get the public suffix of a domain name using the Public Suffix List from http://publicsuffix.org
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">publicsuffix</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pure-sasl/metadata.xml b/dev-python/pure-sasl/metadata.xml
index 3743220e59f..c36b85044fd 100644
--- a/dev-python/pure-sasl/metadata.xml
+++ b/dev-python/pure-sasl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pure-sasl</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyFFTW/metadata.xml b/dev-python/pyFFTW/metadata.xml
index 5898470d0c5..946e1a15f19 100644
--- a/dev-python/pyFFTW/metadata.xml
+++ b/dev-python/pyFFTW/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">pyFFTW/pyFFTW</remote-id>
+		<remote-id type="pypi">pyFFTW</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyalsa/metadata.xml b/dev-python/pyalsa/metadata.xml
index 924dc07b5c1..18a797f3b55 100644
--- a/dev-python/pyalsa/metadata.xml
+++ b/dev-python/pyalsa/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>alsa-bugs@gentoo.org</email>
-	<name>Gentoo ALSA Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
+	<maintainer type="project">
+		<email>alsa-bugs@gentoo.org</email>
+		<name>Gentoo ALSA Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyalsa</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pybind11/metadata.xml b/dev-python/pybind11/metadata.xml
index 02583864202..d0a4da3cd94 100644
--- a/dev-python/pybind11/metadata.xml
+++ b/dev-python/pybind11/metadata.xml
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pybind11</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pycairo/metadata.xml b/dev-python/pycairo/metadata.xml
index e24dd86faa2..91515b4585e 100644
--- a/dev-python/pycairo/metadata.xml
+++ b/dev-python/pycairo/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pycairo</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pychm/metadata.xml b/dev-python/pychm/metadata.xml
index 5c6fd6400c8..25e51a49d0b 100644
--- a/dev-python/pychm/metadata.xml
+++ b/dev-python/pychm/metadata.xml
@@ -18,5 +18,6 @@ Chmパッケージは、C言語ライブラリChmのAPI実装とそれに幾つ
 </longdescription>
 	<upstream>
 		<remote-id type="sourceforge">gnochm</remote-id>
+		<remote-id type="pypi">pychm</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pychromecast/metadata.xml b/dev-python/pychromecast/metadata.xml
index 3ee70120def..fe07d432644 100644
--- a/dev-python/pychromecast/metadata.xml
+++ b/dev-python/pychromecast/metadata.xml
@@ -8,4 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyChromecast</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pychroot/metadata.xml b/dev-python/pychroot/metadata.xml
index 8b229e4daff..73e906b8f91 100644
--- a/dev-python/pychroot/metadata.xml
+++ b/dev-python/pychroot/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">pkgcore/pychroot</remote-id>
-  </upstream>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">pkgcore/pychroot</remote-id>
+		<remote-id type="pypi">pychroot</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyclipper/metadata.xml b/dev-python/pyclipper/metadata.xml
index 3da97a9953c..935afa4da89 100644
--- a/dev-python/pyclipper/metadata.xml
+++ b/dev-python/pyclipper/metadata.xml
@@ -5,4 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyclipper</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pycxx/metadata.xml b/dev-python/pycxx/metadata.xml
index 9c3186ce5be..7ca37577078 100644
--- a/dev-python/pycxx/metadata.xml
+++ b/dev-python/pycxx/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">cxx</remote-id>
+		<remote-id type="pypi">pycxx</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pydata-sphinx-theme/metadata.xml b/dev-python/pydata-sphinx-theme/metadata.xml
index d22e99d7357..001562f7e06 100644
--- a/dev-python/pydata-sphinx-theme/metadata.xml
+++ b/dev-python/pydata-sphinx-theme/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pydata-sphinx-theme</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyfltk/metadata.xml b/dev-python/pyfltk/metadata.xml
index f25f3f8d681..c912ec01839 100644
--- a/dev-python/pyfltk/metadata.xml
+++ b/dev-python/pyfltk/metadata.xml
@@ -11,5 +11,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pyfltk</remote-id>
+		<remote-id type="pypi">pyFltk</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pygame_sdl2/metadata.xml b/dev-python/pygame_sdl2/metadata.xml
index 88d1d1b3d9f..33951f65a61 100644
--- a/dev-python/pygame_sdl2/metadata.xml
+++ b/dev-python/pygame_sdl2/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">renpy/pygame_sdl2</remote-id>
+		<remote-id type="pypi">pygame_sdl2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pygobject/metadata.xml b/dev-python/pygobject/metadata.xml
index a958cbef81b..255ad1b9c7c 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -23,4 +23,7 @@
 		library it is instantly available as a Python API without the need for
 		intermediate Python glue.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">PyGObject</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pygpgme/metadata.xml b/dev-python/pygpgme/metadata.xml
index e655296bf6a..4ed7c399c83 100644
--- a/dev-python/pygpgme/metadata.xml
+++ b/dev-python/pygpgme/metadata.xml
@@ -13,5 +13,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="launchpad">pygpgme</remote-id>
+		<remote-id type="pypi">pygpgme</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyh2o/metadata.xml b/dev-python/pyh2o/metadata.xml
index 175983e000a..4b9474c07b4 100644
--- a/dev-python/pyh2o/metadata.xml
+++ b/dev-python/pyh2o/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <maintainer status="active">
-      <email>mgorny@gentoo.org</email>
-      <name>Michał Górny</name>
-    </maintainer>
-    <bugs-to>https://github.com/mgorny/pyh2o/issues/</bugs-to>
-    <remote-id type="github">mgorny/pyh2o</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<maintainer status="active">
+			<email>mgorny@gentoo.org</email>
+			<name>Michał Górny</name>
+		</maintainer>
+		<bugs-to>https://github.com/mgorny/pyh2o/issues/</bugs-to>
+		<remote-id type="github">mgorny/pyh2o</remote-id>
+		<remote-id type="pypi">pyh2o</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pymad/metadata.xml b/dev-python/pymad/metadata.xml
index e24cb2a46b1..3664c3d2863 100644
--- a/dev-python/pymad/metadata.xml
+++ b/dev-python/pymad/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<upstream>
-	<remote-id type="github">jaqx0r/pymad</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jaqx0r/pymad</remote-id>
+		<remote-id type="pypi">pymad</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index 55440a29c54..c739026bcfd 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<longdescription>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
 This library downloads the weather report for a given station
 ID (get yours from http://www.nws.noaa.gov/tg/siteloc.shtml),
 decodes it and provides easy access to all the data found in the
 report. Documentation and a small example app are inside the tarball.
 </longdescription>
-<longdescription lang="ja">
+	<longdescription lang="ja">
 このライブラリは指定したステーションID( http://www.nws.noaa.gov/tg/siteloc.shtml で入手)から天気予報結果をダウンロードし、解読し、予報データから検索するのに簡単
 なアクセス手段を提供します。ドキュメンテーションと単純なサンプル・アプリケーショ
 ンはtarballファイルの中です。
 </longdescription>
+	<upstream>
+		<remote-id type="pypi">pymetar</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pymilter/metadata.xml b/dev-python/pymilter/metadata.xml
index c653356fd77..e2404273484 100644
--- a/dev-python/pymilter/metadata.xml
+++ b/dev-python/pymilter/metadata.xml
@@ -18,5 +18,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">sdgathman/pymilter</remote-id>
+		<remote-id type="pypi">pymilter</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pymysql/metadata.xml b/dev-python/pymysql/metadata.xml
index 1a095978417..fed09325cd1 100644
--- a/dev-python/pymysql/metadata.xml
+++ b/dev-python/pymysql/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>mysql-bugs@gentoo.org</email>
-    <name>MySQL</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">PyMySQL/PyMySQL</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>mysql-bugs@gentoo.org</email>
+		<name>MySQL</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">PyMySQL/PyMySQL</remote-id>
+		<remote-id type="pypi">PyMySQL</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pynput/metadata.xml b/dev-python/pynput/metadata.xml
index 2b9b4266ca5..270fb0722de 100644
--- a/dev-python/pynput/metadata.xml
+++ b/dev-python/pynput/metadata.xml
@@ -5,4 +5,7 @@
 		<email>zerochaos@gentoo.org</email>
 		<name>Rick Farina</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pynput</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyparted/metadata.xml b/dev-python/pyparted/metadata.xml
index 00fd17201ac..84d64a79ce3 100644
--- a/dev-python/pyparted/metadata.xml
+++ b/dev-python/pyparted/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">dcantrell/pyparted</remote-id>
+		<remote-id type="pypi">pyparted</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyperclip/metadata.xml b/dev-python/pyperclip/metadata.xml
index 631e40d11e7..c6215a36971 100644
--- a/dev-python/pyperclip/metadata.xml
+++ b/dev-python/pyperclip/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pyperclip</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyproject2setuppy/metadata.xml b/dev-python/pyproject2setuppy/metadata.xml
index 5eeef57d071..ea440fb3eaa 100644
--- a/dev-python/pyproject2setuppy/metadata.xml
+++ b/dev-python/pyproject2setuppy/metadata.xml
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pyproject2setuppy</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyre2/metadata.xml b/dev-python/pyre2/metadata.xml
index b218af70486..687c852f406 100644
--- a/dev-python/pyre2/metadata.xml
+++ b/dev-python/pyre2/metadata.xml
@@ -9,4 +9,7 @@
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyre2</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyscreenshot/metadata.xml b/dev-python/pyscreenshot/metadata.xml
index d22e99d7357..b7811ee04d4 100644
--- a/dev-python/pyscreenshot/metadata.xml
+++ b/dev-python/pyscreenshot/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyscreenshot</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyside2/metadata.xml b/dev-python/pyside2/metadata.xml
index 5d371988e7a..1af2c230508 100644
--- a/dev-python/pyside2/metadata.xml
+++ b/dev-python/pyside2/metadata.xml
@@ -37,4 +37,7 @@
 		<flag name="xml">Build QtXml module</flag>
 		<flag name="xmlpatterns">Build QtXmlPatterns module</flag>
 	</use>
+	<upstream>
+		<remote-id type="pypi">PySide2</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pysimdjson/metadata.xml b/dev-python/pysimdjson/metadata.xml
index cee379b1540..bbbada85c7e 100644
--- a/dev-python/pysimdjson/metadata.xml
+++ b/dev-python/pysimdjson/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pysimdjson</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pysmi/metadata.xml b/dev-python/pysmi/metadata.xml
index 36420f308fa..6a5f21bdfe8 100644
--- a/dev-python/pysmi/metadata.xml
+++ b/dev-python/pysmi/metadata.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chainsaw@gentoo.org</email>
+		<name>Tony Vroon</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pysmi</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyspectrum2/metadata.xml b/dev-python/pyspectrum2/metadata.xml
index a7931bdfa4f..76ee416dd5b 100644
--- a/dev-python/pyspectrum2/metadata.xml
+++ b/dev-python/pyspectrum2/metadata.xml
@@ -12,5 +12,6 @@
 	<upstream>
 		<bugs-to>https://github.com/stv0g/pyspectrum2/issues</bugs-to>
 		<remote-id type="github">stv0g/pyspectrum2</remote-id>
+		<remote-id type="pypi">pyspectrum2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
index e649e6dcff7..6299093ac73 100644
--- a/dev-python/pyspelling/metadata.xml
+++ b/dev-python/pyspelling/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="person">
 		<email>lssndrbarbieri@gmail.com</email>
@@ -16,6 +15,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">facelessuser/pyspelling</remote-id>
+		<remote-id type="pypi">pyspelling</remote-id>
 	</upstream>
 	<longdescription lang="en">
 PySpelling is a module to help with automating spell checking in a project with Aspell or 
@@ -24,5 +24,5 @@ checking tools, and allows you to setup different spelling tasks for different f
 You can apply specific and different filters and options to each task. PySpelling can also 
 be used in CI environments to fail the build if there are misspelled words.
 Aspell and Hunspell are very good spell checking tools. Aspell particularly comes with a couple of filters, but the filters are limited in types and aren't extremely flexible. PySpelling was created to work around Aspell's and Hunspell's filtering shortcomings by creating a wrapper around them that could be extended to handle more kinds of file formats and provide more advanced filtering. If you need to filter out specific HTML tags with specific IDs or class names, PySpelling can do it. If you want to scan Python files for docstrings, but also avoid specific content within the docstring, you can do that as well. If PySpelling doesn't have a filter you need, with access to so many available Python modules, you can easily write your own.
-	</longdescription> 
+	</longdescription>
 </pkgmetadata>

diff --git a/dev-python/pytest-datadir/metadata.xml b/dev-python/pytest-datadir/metadata.xml
index d22e99d7357..88b19f00ca5 100644
--- a/dev-python/pytest-datadir/metadata.xml
+++ b/dev-python/pytest-datadir/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-datadir</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-faulthandler/metadata.xml b/dev-python/pytest-faulthandler/metadata.xml
index d22e99d7357..19f4441aca9 100644
--- a/dev-python/pytest-faulthandler/metadata.xml
+++ b/dev-python/pytest-faulthandler/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-faulthandler</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-freezegun/metadata.xml b/dev-python/pytest-freezegun/metadata.xml
index e59516686a4..57ab8884a1d 100644
--- a/dev-python/pytest-freezegun/metadata.xml
+++ b/dev-python/pytest-freezegun/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest-freezegun</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-helpers-namespace/metadata.xml b/dev-python/pytest-helpers-namespace/metadata.xml
index 366c2631e76..8e6e23408c4 100644
--- a/dev-python/pytest-helpers-namespace/metadata.xml
+++ b/dev-python/pytest-helpers-namespace/metadata.xml
@@ -8,4 +8,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-helpers-namespace</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-lazy-fixture/metadata.xml b/dev-python/pytest-lazy-fixture/metadata.xml
index 443a7275aaa..e4c15cc0a50 100644
--- a/dev-python/pytest-lazy-fixture/metadata.xml
+++ b/dev-python/pytest-lazy-fixture/metadata.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
-    <name>Andrew Ammerlaan</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-lazy-fixture</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-regressions/metadata.xml b/dev-python/pytest-regressions/metadata.xml
index c12ae293d46..1a5123349a9 100644
--- a/dev-python/pytest-regressions/metadata.xml
+++ b/dev-python/pytest-regressions/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">pytest-regressions</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-salt-factories/metadata.xml b/dev-python/pytest-salt-factories/metadata.xml
index cee379b1540..b8b1eaa537d 100644
--- a/dev-python/pytest-salt-factories/metadata.xml
+++ b/dev-python/pytest-salt-factories/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-salt-factories</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-salt/metadata.xml b/dev-python/pytest-salt/metadata.xml
index cee379b1540..e83c48f4242 100644
--- a/dev-python/pytest-salt/metadata.xml
+++ b/dev-python/pytest-salt/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-salt</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-tempdir/metadata.xml b/dev-python/pytest-tempdir/metadata.xml
index 56cae167d37..ae2c6b32482 100644
--- a/dev-python/pytest-tempdir/metadata.xml
+++ b/dev-python/pytest-tempdir/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-tempdir</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pytest-testmon/metadata.xml b/dev-python/pytest-testmon/metadata.xml
index c36c37139fa..d04e61e25d7 100644
--- a/dev-python/pytest-testmon/metadata.xml
+++ b/dev-python/pytest-testmon/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pytest-testmon</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-axolotl-curve25519/metadata.xml b/dev-python/python-axolotl-curve25519/metadata.xml
index a516f93c104..2ca1a23bb1e 100644
--- a/dev-python/python-axolotl-curve25519/metadata.xml
+++ b/dev-python/python-axolotl-curve25519/metadata.xml
@@ -16,5 +16,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/python-axolotl-curve25519/issues</bugs-to>
 		<remote-id type="github">tgalal/python-axolotl-curve25519</remote-id>
+		<remote-id type="pypi">python-axolotl-curve25519</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-axolotl/metadata.xml b/dev-python/python-axolotl/metadata.xml
index 1c0ab210519..de730ccdbca 100644
--- a/dev-python/python-axolotl/metadata.xml
+++ b/dev-python/python-axolotl/metadata.xml
@@ -17,5 +17,6 @@
 	<upstream>
 		<bugs-to>https://github.com/tgalal/python-axolotl/issues</bugs-to>
 		<remote-id type="github">tgalal/python-axolotl</remote-id>
+		<remote-id type="pypi">python-axolotl</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-blazarclient/metadata.xml b/dev-python/python-blazarclient/metadata.xml
index 631e40d11e7..1d7688d7960 100644
--- a/dev-python/python-blazarclient/metadata.xml
+++ b/dev-python/python-blazarclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-blazarclient</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-debian/metadata.xml b/dev-python/python-debian/metadata.xml
index 76f69654b26..173ad6be66e 100644
--- a/dev-python/python-debian/metadata.xml
+++ b/dev-python/python-debian/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-debian</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-discid/metadata.xml b/dev-python/python-discid/metadata.xml
index 3a7e5f5b29a..6d4f57f90d9 100644
--- a/dev-python/python-discid/metadata.xml
+++ b/dev-python/python-discid/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">JonnyJD/python-discid</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">JonnyJD/python-discid</remote-id>
+		<remote-id type="pypi">discid</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-dotenv/metadata.xml b/dev-python/python-dotenv/metadata.xml
index 7f33f1c07d7..8acffd41cc4 100644
--- a/dev-python/python-dotenv/metadata.xml
+++ b/dev-python/python-dotenv/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>sping@gentoo.org</email>
@@ -9,4 +9,7 @@
 		<email>python@gentoo.org</email>
 		<name>Gentoo Python Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-dotenv</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
index 126f2621e76..3507c749f45 100644
--- a/dev-python/python-efl/metadata.xml
+++ b/dev-python/python-efl/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-  <longdescription>
-    EFL is a collection of libraries for handling many common tasks a 
-    developer man have such as data structures, communication, 
-    rendering, widgets and more.
+	<maintainer type="person">
+		<email>juippis@gentoo.org</email>
+		<name>Joonas Niilola</name>
+	</maintainer>
+	<longdescription>
+		EFL is a collection of libraries for handling many common tasks a 
+		developer man have such as data structures, communication, 
+		rendering, widgets and more.
 
-    PYTHON-EFL are the python bindings for the whole EFL stack (eo, 
-    evas, ecore, edje, emotion, ethumb and elementary)
-  </longdescription>
+		PYTHON-EFL are the python bindings for the whole EFL stack (eo, 
+		evas, ecore, edje, emotion, ethumb and elementary)
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">python-efl</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
index dd0bd9c021f..165531b18aa 100644
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ b/dev-python/python-jsonrpc-server/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-jsonrpc-server</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
index dd0bd9c021f..b9fcdf3f618 100644
--- a/dev-python/python-language-server/metadata.xml
+++ b/dev-python/python-language-server/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">python-language-server</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-lhafile/metadata.xml b/dev-python/python-lhafile/metadata.xml
index 69ce0cdcd9c..3c5764ce5fd 100644
--- a/dev-python/python-lhafile/metadata.xml
+++ b/dev-python/python-lhafile/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">FrodeSolheim/python-lhafile</remote-id>
+		<remote-id type="pypi">lhafile</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-libevdev/metadata.xml b/dev-python/python-libevdev/metadata.xml
index 3e36bc06aa4..bda7c9f9cb5 100644
--- a/dev-python/python-libevdev/metadata.xml
+++ b/dev-python/python-libevdev/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>x11@gentoo.org</email>
-    <name>X11</name>
-  </maintainer>
+	<maintainer type="project">
+		<email>x11@gentoo.org</email>
+		<name>X11</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">libevdev</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-octaviaclient/metadata.xml b/dev-python/python-octaviaclient/metadata.xml
index 631e40d11e7..1b041d17f9e 100644
--- a/dev-python/python-octaviaclient/metadata.xml
+++ b/dev-python/python-octaviaclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-octaviaclient</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-poppler-qt5/metadata.xml b/dev-python/python-poppler-qt5/metadata.xml
index 37ebb55340a..ae83af2b191 100644
--- a/dev-python/python-poppler-qt5/metadata.xml
+++ b/dev-python/python-poppler-qt5/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">frescobaldi/python-poppler-qt5</remote-id>
+		<remote-id type="pypi">python-poppler-qt5</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-prctl/metadata.xml b/dev-python/python-prctl/metadata.xml
index 76184b8b438..a533d520897 100644
--- a/dev-python/python-prctl/metadata.xml
+++ b/dev-python/python-prctl/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">seveas/python-prctl</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">seveas/python-prctl</remote-id>
+		<remote-id type="pypi">python-prctl</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-systemd/metadata.xml b/dev-python/python-systemd/metadata.xml
index 8986208c5b0..5967660a093 100644
--- a/dev-python/python-systemd/metadata.xml
+++ b/dev-python/python-systemd/metadata.xml
@@ -6,5 +6,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">systemd/python-systemd</remote-id>
+		<remote-id type="pypi">python-systemd</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-vitrageclient/metadata.xml b/dev-python/python-vitrageclient/metadata.xml
index 631e40d11e7..a0ee204bec6 100644
--- a/dev-python/python-vitrageclient/metadata.xml
+++ b/dev-python/python-vitrageclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-vitrageclient</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-xlib/metadata.xml b/dev-python/python-xlib/metadata.xml
index 736c7850461..07efb5b5f76 100644
--- a/dev-python/python-xlib/metadata.xml
+++ b/dev-python/python-xlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -8,5 +8,6 @@
 	<upstream>
 		<remote-id type="sourceforge">python-xlib</remote-id>
 		<remote-id type="github">python-xlib/python-xlib</remote-id>
+		<remote-id type="pypi">python-xlib</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-xmlsec/metadata.xml b/dev-python/python-xmlsec/metadata.xml
index 56cae167d37..e5523976e0c 100644
--- a/dev-python/python-xmlsec/metadata.xml
+++ b/dev-python/python-xmlsec/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">xmlsec</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-zipstream/metadata.xml b/dev-python/python-zipstream/metadata.xml
index c126b28b804..58db0beeb90 100644
--- a/dev-python/python-zipstream/metadata.xml
+++ b/dev-python/python-zipstream/metadata.xml
@@ -6,6 +6,7 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">allanlei/python-zipstream</remote-id>
+		<remote-id type="pypi">zipstream</remote-id>
 		<bugs-to>https://github.com/allanlei/python-zipstream/issues</bugs-to>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/python-zunclient/metadata.xml b/dev-python/python-zunclient/metadata.xml
index 631e40d11e7..5e20b098d66 100644
--- a/dev-python/python-zunclient/metadata.xml
+++ b/dev-python/python-zunclient/metadata.xml
@@ -9,4 +9,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-zunclient</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
index d22e99d7357..a1cade08593 100644
--- a/dev-python/pyvirtualdisplay/metadata.xml
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">PyVirtualDisplay</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/pyzbar/metadata.xml b/dev-python/pyzbar/metadata.xml
index 7f4f33c6dbc..9084ce5b843 100644
--- a/dev-python/pyzbar/metadata.xml
+++ b/dev-python/pyzbar/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pyzbar</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/qdarkstyle/metadata.xml b/dev-python/qdarkstyle/metadata.xml
index 20ab94177c1..80481fb1e9b 100644
--- a/dev-python/qdarkstyle/metadata.xml
+++ b/dev-python/qdarkstyle/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="person">
 		<email>andrewammerlaan@riseup.net</email>
@@ -10,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">QDarkStyle</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/qtsass/metadata.xml b/dev-python/qtsass/metadata.xml
index dd0bd9c021f..a83bd6e4536 100644
--- a/dev-python/qtsass/metadata.xml
+++ b/dev-python/qtsass/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-    <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
-        <name>Andrew Ammerlaan</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">qtsass</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/re-assert/metadata.xml b/dev-python/re-assert/metadata.xml
index e59516686a4..2ec36ed8486 100644
--- a/dev-python/re-assert/metadata.xml
+++ b/dev-python/re-assert/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">re-assert</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/readthedocs-sphinx-ext/metadata.xml b/dev-python/readthedocs-sphinx-ext/metadata.xml
index ec3c387df89..9fa0dfd7b6c 100644
--- a/dev-python/readthedocs-sphinx-ext/metadata.xml
+++ b/dev-python/readthedocs-sphinx-ext/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">readthedocs-sphinx-ext</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/rencode/metadata.xml b/dev-python/rencode/metadata.xml
index 3ca1128740c..be3b0fc774d 100644
--- a/dev-python/rencode/metadata.xml
+++ b/dev-python/rencode/metadata.xml
@@ -11,5 +11,6 @@ pure Python module written by Petru Paler, Connelly Barnes et al.
 </longdescription>
 	<upstream>
 		<remote-id type="github">aresch/rencode</remote-id>
+		<remote-id type="pypi">rencode</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/requests-oauthlib/metadata.xml b/dev-python/requests-oauthlib/metadata.xml
index 58c53b538b8..719241b6384 100644
--- a/dev-python/requests-oauthlib/metadata.xml
+++ b/dev-python/requests-oauthlib/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">requests/requests-oauthlib</remote-id>
+		<remote-id type="pypi">requests-oauthlib</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/requests-unixsocket/metadata.xml b/dev-python/requests-unixsocket/metadata.xml
index 266e3f19ca5..f39c21389d7 100644
--- a/dev-python/requests-unixsocket/metadata.xml
+++ b/dev-python/requests-unixsocket/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">requests-unixsocket</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/retry-decorator/metadata.xml b/dev-python/retry-decorator/metadata.xml
index 3ebcb7e2d26..6ab5a77f0e1 100644
--- a/dev-python/retry-decorator/metadata.xml
+++ b/dev-python/retry-decorator/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">pnpnpn/retry-decorator</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">pnpnpn/retry-decorator</remote-id>
+		<remote-id type="pypi">retry-decorator</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/rjsmin/metadata.xml b/dev-python/rjsmin/metadata.xml
index c36c37139fa..18193f22897 100644
--- a/dev-python/rjsmin/metadata.xml
+++ b/dev-python/rjsmin/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">rjsmin</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/rply/metadata.xml b/dev-python/rply/metadata.xml
index a1678ef4e2d..2abc747e45c 100644
--- a/dev-python/rply/metadata.xml
+++ b/dev-python/rply/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">alex/rply</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alex/rply</remote-id>
+		<remote-id type="pypi">rply</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/rtimulib/metadata.xml b/dev-python/rtimulib/metadata.xml
index b2540862842..c14f3cf91a2 100644
--- a/dev-python/rtimulib/metadata.xml
+++ b/dev-python/rtimulib/metadata.xml
@@ -14,5 +14,6 @@
 	<upstream>
 		<bugs-to>https://github.com/RPi-Distro/RTIMULib/issues</bugs-to>
 		<remote-id type="github">RPi-Distro/RTIMULib</remote-id>
+		<remote-id type="pypi">RTIMULib</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml
index a32d600f949..f2342a2b8ac 100644
--- a/dev-python/sabyenc/metadata.xml
+++ b/dev-python/sabyenc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>whissi@gentoo.org</email>
 		<name>Thomas Deutschmann</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sabyenc</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/scikit-build/metadata.xml b/dev-python/scikit-build/metadata.xml
index 887a2a30e0a..c4d4aee28f0 100644
--- a/dev-python/scikit-build/metadata.xml
+++ b/dev-python/scikit-build/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
@@ -9,4 +8,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">scikit-build</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/serverfiles/metadata.xml b/dev-python/serverfiles/metadata.xml
index 007aaf442ea..9358a3cc04b 100644
--- a/dev-python/serverfiles/metadata.xml
+++ b/dev-python/serverfiles/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>amynka@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">serverfiles</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/setuptools_scm_git_archive/metadata.xml b/dev-python/setuptools_scm_git_archive/metadata.xml
index 1f54352252d..0c29c96341f 100644
--- a/dev-python/setuptools_scm_git_archive/metadata.xml
+++ b/dev-python/setuptools_scm_git_archive/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Pacho Ramos</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">setuptools-scm-git-archive</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/shiboken2/metadata.xml b/dev-python/shiboken2/metadata.xml
index 766f70c1559..391fe0f6d4f 100644
--- a/dev-python/shiboken2/metadata.xml
+++ b/dev-python/shiboken2/metadata.xml
@@ -10,4 +10,7 @@
 		<flag name="numpy">Implicitly convert passed NumPy arrays to Qt lists</flag>
 		<flag name="vulkan">Generate "QSurface::VulkanSurface" bindings</flag>
 	</use>
+	<upstream>
+		<remote-id type="pypi">shiboken2</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/simplebayes/metadata.xml b/dev-python/simplebayes/metadata.xml
index 3b9be0dd1ed..50f86acff51 100644
--- a/dev-python/simplebayes/metadata.xml
+++ b/dev-python/simplebayes/metadata.xml
@@ -13,5 +13,6 @@ This work is heavily inspired by the python "redisbayes" module found here:
 	</longdescription>
 	<upstream>
 		<remote-id type="github">hickeroar/simplebayes</remote-id>
+		<remote-id type="pypi">simplebayes</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/simplesoapy/metadata.xml b/dev-python/simplesoapy/metadata.xml
index 8058136f853..9ddefc70983 100644
--- a/dev-python/simplesoapy/metadata.xml
+++ b/dev-python/simplesoapy/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">xmikos/simplesoapy</remote-id>
+		<remote-id type="pypi">SimpleSoapy</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/simplespectral/metadata.xml b/dev-python/simplespectral/metadata.xml
index 3d1f57eecee..af55c3f1a4b 100644
--- a/dev-python/simplespectral/metadata.xml
+++ b/dev-python/simplespectral/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">xmikos/simplespectral</remote-id>
+		<remote-id type="pypi">SimpleSpectral</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/slimit/metadata.xml b/dev-python/slimit/metadata.xml
index 8fcb09c9e9a..1e181f90851 100644
--- a/dev-python/slimit/metadata.xml
+++ b/dev-python/slimit/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Gentoo Proxy Maintainers Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">slimit</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
index d22e99d7357..624e6919569 100644
--- a/dev-python/sphinx-multiversion/metadata.xml
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinx-multiversion</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index d22e99d7357..4072be559b5 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinx-panels</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/sphinx-testing/metadata.xml b/dev-python/sphinx-testing/metadata.xml
index 605d625f69e..c837a2647c6 100644
--- a/dev-python/sphinx-testing/metadata.xml
+++ b/dev-python/sphinx-testing/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">sphinx-doc/sphinx-testing</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">sphinx-doc/sphinx-testing</remote-id>
+		<remote-id type="pypi">sphinx-testing</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/sphinxcontrib-blockdiag/metadata.xml b/dev-python/sphinxcontrib-blockdiag/metadata.xml
index df1f7a5b0ab..3d8642cf24d 100644
--- a/dev-python/sphinxcontrib-blockdiag/metadata.xml
+++ b/dev-python/sphinxcontrib-blockdiag/metadata.xml
@@ -10,5 +10,6 @@
 			<name>Takeshi KOMIYA</name>
 		</maintainer>
 		<remote-id type="github">blockdiag/sphinxcontrib-blockdiag</remote-id>
+		<remote-id type="pypi">sphinxcontrib-blockdiag</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/sphinxcontrib-httpexample/metadata.xml b/dev-python/sphinxcontrib-httpexample/metadata.xml
index 39ac3a9a959..d1cf45af9ce 100644
--- a/dev-python/sphinxcontrib-httpexample/metadata.xml
+++ b/dev-python/sphinxcontrib-httpexample/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>williamh@gentoo.org</email>
-    <name>William Hubbs</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>vpayno+gentoo@gmail.com</email>
-    <name>Victor Payno</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>vpayno+gentoo@gmail.com</email>
+		<name>Victor Payno</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">sphinxcontrib-httpexample</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/spur/metadata.xml b/dev-python/spur/metadata.xml
index e59516686a4..51b1ef54016 100644
--- a/dev-python/spur/metadata.xml
+++ b/dev-python/spur/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">spur</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
index 8fc11184ab0..51c57d3fb52 100644
--- a/dev-python/spyder-line-profiler/metadata.xml
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-line-profiler</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/spyder-memory-profiler/metadata.xml b/dev-python/spyder-memory-profiler/metadata.xml
index 8fc11184ab0..8d57702fe44 100644
--- a/dev-python/spyder-memory-profiler/metadata.xml
+++ b/dev-python/spyder-memory-profiler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-memory-profiler</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/spyder-notebook/metadata.xml b/dev-python/spyder-notebook/metadata.xml
index 8fc11184ab0..21d0219b1ff 100644
--- a/dev-python/spyder-notebook/metadata.xml
+++ b/dev-python/spyder-notebook/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-notebook</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/spyder-terminal/metadata.xml b/dev-python/spyder-terminal/metadata.xml
index 8fc11184ab0..07953662c9c 100644
--- a/dev-python/spyder-terminal/metadata.xml
+++ b/dev-python/spyder-terminal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-terminal</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/spyder-unittest/metadata.xml b/dev-python/spyder-unittest/metadata.xml
index 8fc11184ab0..52de5cb4741 100644
--- a/dev-python/spyder-unittest/metadata.xml
+++ b/dev-python/spyder-unittest/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">spyder-unittest</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/stapler/metadata.xml b/dev-python/stapler/metadata.xml
index 49cb5cf0b5a..a9cb07912d6 100644
--- a/dev-python/stapler/metadata.xml
+++ b/dev-python/stapler/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">hellerbarde/stapler</remote-id>
+		<remote-id type="pypi">stapler</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/svgwrite/metadata.xml b/dev-python/svgwrite/metadata.xml
index 7f4f33c6dbc..833a9c5c9c8 100644
--- a/dev-python/svgwrite/metadata.xml
+++ b/dev-python/svgwrite/metadata.xml
@@ -5,4 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">svgwrite</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/swagger-spec-validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
index c36c37139fa..39003aa1d43 100644
--- a/dev-python/swagger-spec-validator/metadata.xml
+++ b/dev-python/swagger-spec-validator/metadata.xml
@@ -5,4 +5,7 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">swagger-spec-validator</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
index 202e3195339..7a85ec6adad 100644
--- a/dev-python/symengine/metadata.xml
+++ b/dev-python/symengine/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci-mathematics@gentoo.org</email>
-    <name>Gentoo Mathematics Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">symengine/symengine.py</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">symengine/symengine.py</remote-id>
+		<remote-id type="pypi">symengine</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
index 05a85a5849f..259d00861e4 100644
--- a/dev-python/testpath/metadata.xml
+++ b/dev-python/testpath/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <longdescription>
-    Testpath is a collection of utilities for Python code working with
-    files and commands. It contains functions to check things on the
-    filesystem, and tools for mocking system commands and recording
-    calls to those.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">jupyter/testpath</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription>
+		Testpath is a collection of utilities for Python code working with
+		files and commands. It contains functions to check things on the
+		filesystem, and tools for mocking system commands and recording
+		calls to those.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jupyter/testpath</remote-id>
+		<remote-id type="pypi">testpath</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/threadpoolctl/metadata.xml b/dev-python/threadpoolctl/metadata.xml
index ff70d6e6ba1..1e538b750d4 100644
--- a/dev-python/threadpoolctl/metadata.xml
+++ b/dev-python/threadpoolctl/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-  </maintainer>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <stabilize-allarches/>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">threadpoolctl</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/toml/metadata.xml b/dev-python/toml/metadata.xml
index 85b206a0002..94a222e4490 100644
--- a/dev-python/toml/metadata.xml
+++ b/dev-python/toml/metadata.xml
@@ -1,12 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="github">uiri/toml</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">uiri/toml</remote-id>
+		<remote-id type="pypi">toml</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/transitions/metadata.xml b/dev-python/transitions/metadata.xml
index cb357577f37..bf02683f097 100644
--- a/dev-python/transitions/metadata.xml
+++ b/dev-python/transitions/metadata.xml
@@ -15,5 +15,6 @@
 	<upstream>
 		<bugs-to>https://github.com/pytransitions/transitions/issues</bugs-to>
 		<remote-id type="github">pytransitions/transitions</remote-id>
+		<remote-id type="pypi">transitions</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/translate-toolkit/metadata.xml b/dev-python/translate-toolkit/metadata.xml
index d6edf768cd0..7f98f59237b 100644
--- a/dev-python/translate-toolkit/metadata.xml
+++ b/dev-python/translate-toolkit/metadata.xml
@@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="github">translate</remote-id>
+		<remote-id type="pypi">translate-toolkit</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/trustme/metadata.xml b/dev-python/trustme/metadata.xml
index 986c7fe8b64..9914e7c63b2 100644
--- a/dev-python/trustme/metadata.xml
+++ b/dev-python/trustme/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">trustme</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/tvdb_api/metadata.xml b/dev-python/tvdb_api/metadata.xml
index 373aacb1905..198c2284945 100644
--- a/dev-python/tvdb_api/metadata.xml
+++ b/dev-python/tvdb_api/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>thev00d00@gentoo.org</email>
-    <name>Ian Whyman</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">dbr/tvdb_api</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>thev00d00@gentoo.org</email>
+		<name>Ian Whyman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dbr/tvdb_api</remote-id>
+		<remote-id type="pypi">tvdb-api</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ubelt/metadata.xml b/dev-python/ubelt/metadata.xml
index ca93985fb0d..692a51ccf09 100644
--- a/dev-python/ubelt/metadata.xml
+++ b/dev-python/ubelt/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">ubelt</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/uranium/metadata.xml b/dev-python/uranium/metadata.xml
index a1111722f75..0f2925ceea2 100644
--- a/dev-python/uranium/metadata.xml
+++ b/dev-python/uranium/metadata.xml
@@ -30,5 +30,6 @@
 	</slots>
 	<upstream>
 		<remote-id type="github">Ultimaker/Uranium</remote-id>
+		<remote-id type="pypi">uranium</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/urdf_parser_py/metadata.xml b/dev-python/urdf_parser_py/metadata.xml
index 9bbf130c48d..e79c08cb164 100644
--- a/dev-python/urdf_parser_py/metadata.xml
+++ b/dev-python/urdf_parser_py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">ros/urdf_parser_py</remote-id>
+		<remote-id type="pypi">urdf-parser-py</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
index 61b9e764b90..96c924d2a32 100644
--- a/dev-python/urlgrabber/metadata.xml
+++ b/dev-python/urlgrabber/metadata.xml
@@ -1,37 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <longdescription>
-    A high-level cross-protocol url-grabber.
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<longdescription>
+		A high-level cross-protocol url-grabber.
 
-    Using urlgrabber, data can be fetched in three basic ways:
+		Using urlgrabber, data can be fetched in three basic ways:
 
-    urlgrab(url) copy the file to the local filesystem
-    urlopen(url) open the remote file and return a file object (like urllib2.urlopen)
-    urlread(url) return the contents of the file as a string
+		urlgrab(url) copy the file to the local filesystem
+		urlopen(url) open the remote file and return a file object (like urllib2.urlopen)
+		urlread(url) return the contents of the file as a string
 
 
-    When using these functions (or methods), urlgrabber supports the following
-    features:
+		When using these functions (or methods), urlgrabber supports the following
+		features:
 
-    * identical behavior for http://, ftp://, and file:// urls
-    * http keepalive - faster downloads of many files by using only a single
-      connection
-    * byte ranges - fetch only a portion of the file
-    * reget - for a urlgrab, resume a partial download
-    * progress meters - the ability to report download progress automatically,
-      even when using urlopen!
-    * throttling - restrict bandwidth usage
-    * retries - automatically retry a download if it fails. The number of retries
-      and failure types are configurable.
-    * authenticated server access for http and ftp
-    * proxy support - support for authenticated http and ftp proxies
-    * mirror groups - treat a list of mirrors as a single source, automatically
-      switching mirrors if there is a failure.
-  </longdescription>
-  <stabilize-allarches/>
+		* identical behavior for http://, ftp://, and file:// urls
+		* http keepalive - faster downloads of many files by using only a single
+		connection
+		* byte ranges - fetch only a portion of the file
+		* reget - for a urlgrab, resume a partial download
+		* progress meters - the ability to report download progress automatically,
+		even when using urlopen!
+		* throttling - restrict bandwidth usage
+		* retries - automatically retry a download if it fails. The number of retries
+		and failure types are configurable.
+		* authenticated server access for http and ftp
+		* proxy support - support for authenticated http and ftp proxies
+		* mirror groups - treat a list of mirrors as a single source, automatically
+		switching mirrors if there is a failure.
+	</longdescription>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">urlgrabber</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/vcstools/metadata.xml b/dev-python/vcstools/metadata.xml
index b60fa728c8d..37147c6c904 100644
--- a/dev-python/vcstools/metadata.xml
+++ b/dev-python/vcstools/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">vcstools/vcstools</remote-id>
+		<remote-id type="pypi">vcstools</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/vncdotool/metadata.xml b/dev-python/vncdotool/metadata.xml
index c12ae293d46..6bdb075d75c 100644
--- a/dev-python/vncdotool/metadata.xml
+++ b/dev-python/vncdotool/metadata.xml
@@ -10,4 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">vncdotool</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/webassets/metadata.xml b/dev-python/webassets/metadata.xml
index 66aeb500eb6..66b566453bb 100644
--- a/dev-python/webassets/metadata.xml
+++ b/dev-python/webassets/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">miracle2k/webassets</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">miracle2k/webassets</remote-id>
+		<remote-id type="pypi">webassets</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/websockets/metadata.xml b/dev-python/websockets/metadata.xml
index a3e93786e38..98f685d013f 100644
--- a/dev-python/websockets/metadata.xml
+++ b/dev-python/websockets/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aaugustin/websockets</remote-id>
+		<remote-id type="pypi">websockets</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index cb991999cfd..b9be7d64e18 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
-  <use>
-    <flag name="client">Install client modules</flag>
-    <flag name="server">Install server modules</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">Lawouach/WebSocket-for-Python</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<use>
+		<flag name="client">Install client modules</flag>
+		<flag name="server">Install server modules</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">Lawouach/WebSocket-for-Python</remote-id>
+		<remote-id type="pypi">ws4py</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index 0796b4162e0..6efec25372f 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="github">wxWidgets/Phoenix</remote-id>
+		<remote-id type="pypi">wxPython</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/xdoctest/metadata.xml b/dev-python/xdoctest/metadata.xml
index ca93985fb0d..c4ab9400881 100644
--- a/dev-python/xdoctest/metadata.xml
+++ b/dev-python/xdoctest/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<maintainer type="project">
 		<email>sci@gentoo.org</email>
 		<name>Gentoo Science Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">xdoctest</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/yapf/metadata.xml b/dev-python/yapf/metadata.xml
index 01578e600b8..602784a7a25 100644
--- a/dev-python/yapf/metadata.xml
+++ b/dev-python/yapf/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>chr@chymera.eu</email>
 		<name>Horea Christian</name>
 	</maintainer>
-		<maintainer type="project">
+	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -15,4 +15,7 @@
 		formatting that conforms to the style guide, even if the original code
 		didn't violate the style guide.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">yapf</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/yapsy/metadata.xml b/dev-python/yapsy/metadata.xml
index 59dcad63b3a..e34e857fd2e 100644
--- a/dev-python/yapsy/metadata.xml
+++ b/dev-python/yapsy/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">yapsy</remote-id>
+		<remote-id type="pypi">Yapsy</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-python/zVMCloudConnector/metadata.xml b/dev-python/zVMCloudConnector/metadata.xml
index f0b57700570..4b9db07e299 100644
--- a/dev-python/zVMCloudConnector/metadata.xml
+++ b/dev-python/zVMCloudConnector/metadata.xml
@@ -11,4 +11,7 @@
 	<longdescription lang="en">
 		z/VM cloud connector is a development sdk for manage z/VM. It provides a set of APIs to operate z/VM including guest, image, network, volume etc.
 	</longdescription>
+	<upstream>
+		<remote-id type="pypi">zVMCloudConnector</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-python/zxcvbn/metadata.xml b/dev-python/zxcvbn/metadata.xml
index 266e3f19ca5..7f590bf4c96 100644
--- a/dev-python/zxcvbn/metadata.xml
+++ b/dev-python/zxcvbn/metadata.xml
@@ -4,4 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<upstream>
+		<remote-id type="pypi">zxcvbn</remote-id>
+	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2020-12-11 17:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-11 17:19 [gentoo-commits] repo/gentoo:master commit in: dev-python/requests-unixsocket/, dev-python/pytest-freezegun/, Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox