diff --git a/app-eselect/eselect-QtPy/files/qtpy.eselect-1.0 b/app-eselect/eselect-QtPy/files/qtpy.eselect-1.0
index 108ce47fcb1ee..07521bf5b8f2f 100644
--- a/app-eselect/eselect-QtPy/files/qtpy.eselect-1.0
+++ b/app-eselect/eselect-QtPy/files/qtpy.eselect-1.0
@@ -8,4 +8,4 @@ EDITOR_LIST="pyqt5:/usr/bin/pyrcc5 pyside2:/usr/include/PySide2/QtCore/pyside2_q
inherit editor-variable
DESCRIPTION="Manage the ${EDITOR_VAR} environment variable"
-MAINTAINER="andrewammerlaan@riseup.net"
+MAINTAINER="andrewammerlaan@gentoo.org"
diff --git a/app-eselect/eselect-QtPy/metadata.xml b/app-eselect/eselect-QtPy/metadata.xml
index a8fd13bb34ab5..db649b0116a3d 100644
--- a/app-eselect/eselect-QtPy/metadata.xml
+++ b/app-eselect/eselect-QtPy/metadata.xml
@@ -5,12 +5,8 @@
python@gentoo.org
Gentoo Python Project
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-libs/libsass/metadata.xml b/dev-libs/libsass/metadata.xml
index d97f05d217be5..e76a607218739 100644
--- a/dev-libs/libsass/metadata.xml
+++ b/dev-libs/libsass/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
LibSass is a C++ port of the original Ruby Sass CSS compiler with a C
API. It is coded with portability and efficiency in mind. You can
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 1ad412dcb92f0..f0ef6662c62b8 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -5,14 +5,10 @@
python@gentoo.org
Gentoo Python Project
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
QtPy is a small abstraction layer that lets you write applications using a single API call to either PyQt or PySide.
It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5 layout (where the QtGui module has been split into QtGui and QtWidgets).
diff --git a/dev-python/abydos/metadata.xml b/dev-python/abydos/metadata.xml
index eadfd95b06c54..289752035b814 100644
--- a/dev-python/abydos/metadata.xml
+++ b/dev-python/abydos/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
abydos
diff --git a/dev-python/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml
index cb009855b9a49..0c26badc91b18 100644
--- a/dev-python/backrefs/metadata.xml
+++ b/dev-python/backrefs/metadata.xml
@@ -5,8 +5,8 @@
lssndrbarbieri@gmail.com
Alessandro Barbieri
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
diff --git a/dev-python/bracex/metadata.xml b/dev-python/bracex/metadata.xml
index 59ce61ec8aef9..8badec61ee20d 100644
--- a/dev-python/bracex/metadata.xml
+++ b/dev-python/bracex/metadata.xml
@@ -5,8 +5,8 @@
lssndrbarbieri@gmail.com
Alessandro Barbieri
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
diff --git a/dev-python/easyprocess/metadata.xml b/dev-python/easyprocess/metadata.xml
index ec678a81e4dd7..756593616a8c1 100644
--- a/dev-python/easyprocess/metadata.xml
+++ b/dev-python/easyprocess/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
EasyProcess
diff --git a/dev-python/entrypoint2/metadata.xml b/dev-python/entrypoint2/metadata.xml
index fabc974a5cb86..da081937a49d9 100644
--- a/dev-python/entrypoint2/metadata.xml
+++ b/dev-python/entrypoint2/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
entrypoint2
diff --git a/dev-python/exdown/metadata.xml b/dev-python/exdown/metadata.xml
index 38ff0546051ab..e583da492b403 100644
--- a/dev-python/exdown/metadata.xml
+++ b/dev-python/exdown/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/helpdev/metadata.xml b/dev-python/helpdev/metadata.xml
index 44eb352f91e99..61715a303c09d 100644
--- a/dev-python/helpdev/metadata.xml
+++ b/dev-python/helpdev/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
helpdev
diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
index 7038044626d6c..82636ad94d407 100644
--- a/dev-python/libsass/metadata.xml
+++ b/dev-python/libsass/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
libsass
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index 7f894d64d3578..19a8d2eb82cba 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
lepture/python-livereload
diff --git a/dev-python/lunr/metadata.xml b/dev-python/lunr/metadata.xml
index 602cb18ef31ae..4f11f36659b23 100644
--- a/dev-python/lunr/metadata.xml
+++ b/dev-python/lunr/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
diff --git a/dev-python/mdx_gh_links/metadata.xml b/dev-python/mdx_gh_links/metadata.xml
index 7d63c6d38f79b..f74e363e17afc 100644
--- a/dev-python/mdx_gh_links/metadata.xml
+++ b/dev-python/mdx_gh_links/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
mdx_gh_links
diff --git a/dev-python/mkautodoc/metadata.xml b/dev-python/mkautodoc/metadata.xml
index d17014b5fd60a..d3cd9cc9b2420 100644
--- a/dev-python/mkautodoc/metadata.xml
+++ b/dev-python/mkautodoc/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index dcbfc82c7cce2..79d373e7c09f2 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
mkdocs-bootstrap
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index 5de5c94747d6b..2df721f55e14d 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
mkdocs-bootswatch
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
index 357cb64eab82a..9fc8a7aeb8ac5 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/mkdocs-material-extensions/metadata.xml b/dev-python/mkdocs-material-extensions/metadata.xml
index 974aef64816e4..fb28804cb5617 100644
--- a/dev-python/mkdocs-material-extensions/metadata.xml
+++ b/dev-python/mkdocs-material-extensions/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
facelessuser/mkdocs-material-extensions
mkdocs-material-extensions
diff --git a/dev-python/mkdocs-material/metadata.xml b/dev-python/mkdocs-material/metadata.xml
index b0e3dd82e8671..ef2df102d2ce6 100644
--- a/dev-python/mkdocs-material/metadata.xml
+++ b/dev-python/mkdocs-material/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
What to expect
diff --git a/dev-python/mkdocs-minify-plugin/metadata.xml b/dev-python/mkdocs-minify-plugin/metadata.xml
index 0285564288496..e19619093862f 100644
--- a/dev-python/mkdocs-minify-plugin/metadata.xml
+++ b/dev-python/mkdocs-minify-plugin/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
byrnereese/mkdocs-minify-plugin
diff --git a/dev-python/mkdocs-redirects/metadata.xml b/dev-python/mkdocs-redirects/metadata.xml
index 1d499ba4c7778..2e442c4d3a049 100644
--- a/dev-python/mkdocs-redirects/metadata.xml
+++ b/dev-python/mkdocs-redirects/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
datarobot/mkdocs-redirects
mkdocs-redirects
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index d15529bfacecc..7025df6c32d3b 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
mkdocs/mkdocs
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
index 54b88360c384b..50a13facc0b1f 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
+++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
@@ -5,8 +5,8 @@
lssndrbarbieri@gmail.com
Alessandro Barbieri
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
diff --git a/dev-python/mss/metadata.xml b/dev-python/mss/metadata.xml
index a68d10c6ebbce..eebb2bc4a4f7e 100644
--- a/dev-python/mss/metadata.xml
+++ b/dev-python/mss/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
mss
diff --git a/dev-python/oset/metadata.xml b/dev-python/oset/metadata.xml
index ce5437234e2a6..ba9e1475b0d92 100644
--- a/dev-python/oset/metadata.xml
+++ b/dev-python/oset/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
oset
diff --git a/dev-python/pweave/metadata.xml b/dev-python/pweave/metadata.xml
index 3bea03a73f769..86940343905b6 100644
--- a/dev-python/pweave/metadata.xml
+++ b/dev-python/pweave/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
Pweave
diff --git a/dev-python/pybtex-docutils/metadata.xml b/dev-python/pybtex-docutils/metadata.xml
index e6d5218bdda96..87a222fe44881 100644
--- a/dev-python/pybtex-docutils/metadata.xml
+++ b/dev-python/pybtex-docutils/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pybtex-docutils
mcmtroffaes/pybtex-docutils
diff --git a/dev-python/pydata-sphinx-theme/metadata.xml b/dev-python/pydata-sphinx-theme/metadata.xml
index 8db7c1642941f..5ef2e0e1dcc86 100644
--- a/dev-python/pydata-sphinx-theme/metadata.xml
+++ b/dev-python/pydata-sphinx-theme/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/pydocstyle/metadata.xml b/dev-python/pydocstyle/metadata.xml
index 0923fdb760e9d..a9b559cf313a1 100644
--- a/dev-python/pydocstyle/metadata.xml
+++ b/dev-python/pydocstyle/metadata.xml
@@ -9,14 +9,10 @@
monsieurp@gentoo.org
Patrice Clement
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
PyCQA/pydocstyle
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
index cc185c88ead32..7b06e078f1b67 100644
--- a/dev-python/pyls-black/metadata.xml
+++ b/dev-python/pyls-black/metadata.xml
@@ -6,12 +6,8 @@
rupert/pyls-black
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-python/pyls-spyder/metadata.xml b/dev-python/pyls-spyder/metadata.xml
index 3a143bba6eb18..58ecc877176b5 100644
--- a/dev-python/pyls-spyder/metadata.xml
+++ b/dev-python/pyls-spyder/metadata.xml
@@ -6,12 +6,8 @@
spyder-ide/pyls-spyder
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-python/pymdown-extensions/metadata.xml b/dev-python/pymdown-extensions/metadata.xml
index 8e69a6776f503..15a26705528b5 100644
--- a/dev-python/pymdown-extensions/metadata.xml
+++ b/dev-python/pymdown-extensions/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/pymdown-lexers/metadata.xml b/dev-python/pymdown-lexers/metadata.xml
index 924bc0a43c6f7..55ec4409f77cf 100644
--- a/dev-python/pymdown-lexers/metadata.xml
+++ b/dev-python/pymdown-lexers/metadata.xml
@@ -5,8 +5,8 @@
lssndrbarbieri@gmail.com
Alessandro Barbieri
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
diff --git a/dev-python/pyscreenshot/metadata.xml b/dev-python/pyscreenshot/metadata.xml
index 69cee15cca18a..b0acad4b0dfd1 100644
--- a/dev-python/pyscreenshot/metadata.xml
+++ b/dev-python/pyscreenshot/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
index a28ed69c911fc..3cdf4cf7828c8 100644
--- a/dev-python/pyspelling/metadata.xml
+++ b/dev-python/pyspelling/metadata.xml
@@ -5,8 +5,8 @@
lssndrbarbieri@gmail.com
Alessandro Barbieri
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
diff --git a/dev-python/pytest-datadir/metadata.xml b/dev-python/pytest-datadir/metadata.xml
index 161817b6a08fa..7bb9481873497 100644
--- a/dev-python/pytest-datadir/metadata.xml
+++ b/dev-python/pytest-datadir/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pytest-datadir
diff --git a/dev-python/pytest-faulthandler/metadata.xml b/dev-python/pytest-faulthandler/metadata.xml
index fabb80400e144..34606dee157c3 100644
--- a/dev-python/pytest-faulthandler/metadata.xml
+++ b/dev-python/pytest-faulthandler/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pytest-faulthandler
diff --git a/dev-python/pytest-lazy-fixture/metadata.xml b/dev-python/pytest-lazy-fixture/metadata.xml
index f05dc450af003..690f07df37123 100644
--- a/dev-python/pytest-lazy-fixture/metadata.xml
+++ b/dev-python/pytest-lazy-fixture/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pytest-lazy-fixture
diff --git a/dev-python/pytest-ordering/metadata.xml b/dev-python/pytest-ordering/metadata.xml
index 1c34475beb5ee..1c5d7c4cd511b 100644
--- a/dev-python/pytest-ordering/metadata.xml
+++ b/dev-python/pytest-ordering/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
ftobia/pytest-ordering
diff --git a/dev-python/pytest-qt/metadata.xml b/dev-python/pytest-qt/metadata.xml
index 9addeb33e0f51..1ce572b568b91 100644
--- a/dev-python/pytest-qt/metadata.xml
+++ b/dev-python/pytest-qt/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pytest-qt
pytest-dev/pytest-qt
diff --git a/dev-python/pytest-regressions/metadata.xml b/dev-python/pytest-regressions/metadata.xml
index e07abee2b0470..d03a483232060 100644
--- a/dev-python/pytest-regressions/metadata.xml
+++ b/dev-python/pytest-regressions/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/pytest-xvfb/metadata.xml b/dev-python/pytest-xvfb/metadata.xml
index c5489072fff38..d16e469ea4542 100644
--- a/dev-python/pytest-xvfb/metadata.xml
+++ b/dev-python/pytest-xvfb/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pytest-xvfb
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index 774e7cd21687d..ebdfae47fca0e 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -1,8 +1,8 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
index 2a7e631036f87..9282bf9d7ace1 100644
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ b/dev-python/python-jsonrpc-server/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python-jsonrpc-server
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
index b05ceca6d39f2..46b054f2ca607 100644
--- a/dev-python/python-language-server/metadata.xml
+++ b/dev-python/python-language-server/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python-language-server
diff --git a/dev-python/python-lsp-jsonrpc/metadata.xml b/dev-python/python-lsp-jsonrpc/metadata.xml
index 8de0ea8673234..61471bd8fc75f 100644
--- a/dev-python/python-lsp-jsonrpc/metadata.xml
+++ b/dev-python/python-lsp-jsonrpc/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/python-lsp-server/metadata.xml b/dev-python/python-lsp-server/metadata.xml
index 92cf56e5f768a..d18c2963a96b8 100644
--- a/dev-python/python-lsp-server/metadata.xml
+++ b/dev-python/python-lsp-server/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
index 4c3f22067ecf6..caf8a8a7b062c 100644
--- a/dev-python/pyvirtualdisplay/metadata.xml
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
index 8e37617bffe08..5a2a2d0429aa4 100644
--- a/dev-python/pyxDamerauLevenshtein/metadata.xml
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
pyxDamerauLevenshtein
gfairchild/pyxDamerauLevenshtein
diff --git a/dev-python/qdarkstyle/metadata.xml b/dev-python/qdarkstyle/metadata.xml
index 5f2c893716071..40961b989eb0c 100644
--- a/dev-python/qdarkstyle/metadata.xml
+++ b/dev-python/qdarkstyle/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
QDarkStyle
diff --git a/dev-python/qstylizer/metadata.xml b/dev-python/qstylizer/metadata.xml
index 4db1da22a0457..993f2c5f1c71b 100644
--- a/dev-python/qstylizer/metadata.xml
+++ b/dev-python/qstylizer/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
qstylizer
diff --git a/dev-python/qtawesome/metadata.xml b/dev-python/qtawesome/metadata.xml
index ab6d7816c1527..5726e1719fa6a 100644
--- a/dev-python/qtawesome/metadata.xml
+++ b/dev-python/qtawesome/metadata.xml
@@ -9,14 +9,10 @@
python@gentoo.org
Python
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
QtAwesome enables iconic fonts such as Font Awesome and Elusive Icons
in PyQt and PySide applications.
diff --git a/dev-python/qtsass/metadata.xml b/dev-python/qtsass/metadata.xml
index f4b2c5f82c3db..645a3f43f1e97 100644
--- a/dev-python/qtsass/metadata.xml
+++ b/dev-python/qtsass/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
qtsass
diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
index 15279e67f6c7c..9bf5f36c75d89 100644
--- a/dev-python/sphinx-multiversion/metadata.xml
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
sphinx-multiversion
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index 0082b334b6a48..012cfe382db2a 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
sphinx-panels
diff --git a/dev-python/sphinxcontrib-autoprogram/metadata.xml b/dev-python/sphinxcontrib-autoprogram/metadata.xml
index 98890bad775ca..acdae113d8faa 100644
--- a/dev-python/sphinxcontrib-autoprogram/metadata.xml
+++ b/dev-python/sphinxcontrib-autoprogram/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
sphinxcontrib-autoprogram
diff --git a/dev-python/sphinxcontrib-bibtex/metadata.xml b/dev-python/sphinxcontrib-bibtex/metadata.xml
index 9190fb38ebae8..0b33b2fdc73d5 100644
--- a/dev-python/sphinxcontrib-bibtex/metadata.xml
+++ b/dev-python/sphinxcontrib-bibtex/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
sphinxcontrib-bibtex
mcmtroffaes/sphinxcontrib-bibtex
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index ca9ada26d5c71..d8d128a283008 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -6,14 +6,10 @@
spyder-ide/spyder-kernels
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
index c305fc8201a1e..b30429d514152 100644
--- a/dev-python/spyder-line-profiler/metadata.xml
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
spyder-line-profiler
diff --git a/dev-python/spyder-memory-profiler/metadata.xml b/dev-python/spyder-memory-profiler/metadata.xml
index 393dd96435ecc..1cfd12a72a449 100644
--- a/dev-python/spyder-memory-profiler/metadata.xml
+++ b/dev-python/spyder-memory-profiler/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
spyder-memory-profiler
diff --git a/dev-python/spyder-notebook/metadata.xml b/dev-python/spyder-notebook/metadata.xml
index c6b8218f432dd..98fe853de34ea 100644
--- a/dev-python/spyder-notebook/metadata.xml
+++ b/dev-python/spyder-notebook/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
spyder-notebook
diff --git a/dev-python/spyder-terminal/metadata.xml b/dev-python/spyder-terminal/metadata.xml
index a8b9b9d83ea95..e77bde2acce4d 100644
--- a/dev-python/spyder-terminal/metadata.xml
+++ b/dev-python/spyder-terminal/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
spyder-terminal
diff --git a/dev-python/spyder-unittest/metadata.xml b/dev-python/spyder-unittest/metadata.xml
index f67bf8d25f881..c16dbea390707 100644
--- a/dev-python/spyder-unittest/metadata.xml
+++ b/dev-python/spyder-unittest/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
spyder-unittest
diff --git a/dev-python/spyder-vim/metadata.xml b/dev-python/spyder-vim/metadata.xml
index d232c13afa505..900b4fbe18301 100644
--- a/dev-python/spyder-vim/metadata.xml
+++ b/dev-python/spyder-vim/metadata.xml
@@ -1,13 +1,9 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 856ece14e5e35..c54c89a66fe55 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -5,14 +5,10 @@
python@gentoo.org
Python
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
Spyder is a powerful scientific environment written in Python,
diff --git a/dev-python/textdistance/metadata.xml b/dev-python/textdistance/metadata.xml
index 5b3c0dc6221c3..b78634726053a 100644
--- a/dev-python/textdistance/metadata.xml
+++ b/dev-python/textdistance/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
textdistance
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
index 469357ce4cb7d..3fbc59f479cfa 100644
--- a/dev-python/three-merge/metadata.xml
+++ b/dev-python/three-merge/metadata.xml
@@ -5,12 +5,8 @@
three-merge
spyder-ide/three-merge
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
index 660770e534475..c418000c564f4 100644
--- a/dev-python/tikzplotlib/metadata.xml
+++ b/dev-python/tikzplotlib/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
python@gentoo.org
Python
diff --git a/dev-python/vncdotool/metadata.xml b/dev-python/vncdotool/metadata.xml
index 2b47efc97038c..bf17504df13ae 100644
--- a/dev-python/vncdotool/metadata.xml
+++ b/dev-python/vncdotool/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
vncdotool
diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml
index 5320e20ee0f25..1890dab7aa7cf 100644
--- a/dev-python/wcmatch/metadata.xml
+++ b/dev-python/wcmatch/metadata.xml
@@ -5,8 +5,8 @@
lssndrbarbieri@gmail.com
Alessandro Barbieri
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
diff --git a/dev-python/wurlitzer/metadata.xml b/dev-python/wurlitzer/metadata.xml
index bbe06706f7359..c9f06eef41172 100644
--- a/dev-python/wurlitzer/metadata.xml
+++ b/dev-python/wurlitzer/metadata.xml
@@ -1,14 +1,10 @@
-
- andrewammerlaan@riseup.net
+
+ andrewammerlaan@gentoo.org
Andrew Ammerlaan
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
wurlitzer
diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index cc3b5b0a1ac4a..7ee7a11ca5e4e 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -3,9 +3,9 @@
# @ECLASS: docs.eclass
# @MAINTAINER:
-# Andrew Ammerlaan
+# Andrew Ammerlaan
# @AUTHOR:
-# Author: Andrew Ammerlaan
+# Author: Andrew Ammerlaan
# Based on the work of: Michał Górny
# @SUPPORTED_EAPIS: 6 7
# @BLURB: A simple eclass to build documentation.
diff --git a/profiles/package.mask b/profiles/package.mask
index 4ea123977a5da..db2fecb6aa99e 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -818,7 +818,7 @@ dev-lang/spark
# Mask until sys-libs/libxcrypt[system] is unmasked
>=virtual/libcrypt-2
-# Andrew Ammerlaan (2020-01-26)
+# Andrew Ammerlaan (2020-01-26)
# v3.6.4 uses huge amounts of memory: Bug #705682
# v3.6.1 is the latest version without this issue
>=dev-libs/libsass-3.6.2