*/*: update my email address

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>

49 files changed, 49 insertions, 49 deletions

diff --git a/app-misc/brightness-control/metadata.xml b/app-misc/brightness-control/metadata.xml
index 1210e7ebc..287879405 100644
--- a/app-misc/brightness-control/metadata.xml
+++ b/app-misc/brightness-control/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-misc/ddcui/metadata.xml b/app-misc/ddcui/metadata.xml
index 1210e7ebc..287879405 100644
--- a/app-misc/ddcui/metadata.xml
+++ b/app-misc/ddcui/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/curio/metadata.xml b/dev-python/curio/metadata.xml
index d98754e25..d32427c1e 100644
--- a/dev-python/curio/metadata.xml
+++ b/dev-python/curio/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/devtools/metadata.xml b/dev-python/devtools/metadata.xml
index db28bcb34..9b090178b 100644
--- a/dev-python/devtools/metadata.xml
+++ b/dev-python/devtools/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/hstspreload/metadata.xml b/dev-python/hstspreload/metadata.xml
index 1f1cfe2f1..797579c7f 100644
--- a/dev-python/hstspreload/metadata.xml
+++ b/dev-python/hstspreload/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/jupyter-sphinx/metadata.xml b/dev-python/jupyter-sphinx/metadata.xml
index a878754a0..9bf31b63f 100644
--- a/dev-python/jupyter-sphinx/metadata.xml
+++ b/dev-python/jupyter-sphinx/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/markdown-include/metadata.xml b/dev-python/markdown-include/metadata.xml
index 0ff047d24..44fe10d52 100644
--- a/dev-python/markdown-include/metadata.xml
+++ b/dev-python/markdown-include/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/mkdocs-exclude/metadata.xml b/dev-python/mkdocs-exclude/metadata.xml
index e3ffbfe20..518928e14 100644
--- a/dev-python/mkdocs-exclude/metadata.xml
+++ b/dev-python/mkdocs-exclude/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/outcome/metadata.xml b/dev-python/outcome/metadata.xml
index a3b7ac920..d06907f9b 100644
--- a/dev-python/outcome/metadata.xml
+++ b/dev-python/outcome/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <upstream>
diff --git a/dev-python/pydbus/metadata.xml b/dev-python/pydbus/metadata.xml
index 628ab2017..651e2156c 100644
--- a/dev-python/pydbus/metadata.xml
+++ b/dev-python/pydbus/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/dev-python/pygsl/metadata.xml b/dev-python/pygsl/metadata.xml
index 10f7fabc5..07ec539e1 100644
--- a/dev-python/pygsl/metadata.xml
+++ b/dev-python/pygsl/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/pytest-isort/metadata.xml b/dev-python/pytest-isort/metadata.xml
index 3add1c90d..61f2519b1 100644
--- a/dev-python/pytest-isort/metadata.xml
+++ b/dev-python/pytest-isort/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/pytest-marks/metadata.xml b/dev-python/pytest-marks/metadata.xml
index 628ab2017..651e2156c 100644
--- a/dev-python/pytest-marks/metadata.xml
+++ b/dev-python/pytest-marks/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/dev-python/pytest-toolbox/metadata.xml b/dev-python/pytest-toolbox/metadata.xml
index 2bea5658e..21a336f18 100644
--- a/dev-python/pytest-toolbox/metadata.xml
+++ b/dev-python/pytest-toolbox/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/dev-python/python-mpv/metadata.xml b/dev-python/python-mpv/metadata.xml
index 628ab2017..651e2156c 100644
--- a/dev-python/python-mpv/metadata.xml
+++ b/dev-python/python-mpv/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-vlc/metadata.xml b/dev-python/python-vlc/metadata.xml
index 628ab2017..651e2156c 100644
--- a/dev-python/python-vlc/metadata.xml
+++ b/dev-python/python-vlc/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/dev-python/sphinx-autodoc-typehints/metadata.xml b/dev-python/sphinx-autodoc-typehints/metadata.xml
index f42463741..fdd2f01f5 100644
--- a/dev-python/sphinx-autodoc-typehints/metadata.xml
+++ b/dev-python/sphinx-autodoc-typehints/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/sphinxcontrib-trio/metadata.xml b/dev-python/sphinxcontrib-trio/metadata.xml
index 02b4005ec..d5051d790 100644
--- a/dev-python/sphinxcontrib-trio/metadata.xml
+++ b/dev-python/sphinxcontrib-trio/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/sphobjinv/metadata.xml b/dev-python/sphobjinv/metadata.xml
index 85aabf154..079d24e6f 100644
--- a/dev-python/sphobjinv/metadata.xml
+++ b/dev-python/sphobjinv/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/spotipy/metadata.xml b/dev-python/spotipy/metadata.xml
index 628ab2017..651e2156c 100644
--- a/dev-python/spotipy/metadata.xml
+++ b/dev-python/spotipy/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/dev-python/stdio-mgr/metadata.xml b/dev-python/stdio-mgr/metadata.xml
index dd02714ab..cfe2eacab 100644
--- a/dev-python/stdio-mgr/metadata.xml
+++ b/dev-python/stdio-mgr/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/tekore/metadata.xml b/dev-python/tekore/metadata.xml
index 628ab2017..651e2156c 100644
--- a/dev-python/tekore/metadata.xml
+++ b/dev-python/tekore/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/dev-python/trio/metadata.xml b/dev-python/trio/metadata.xml
index a9e12d363..d086a391f 100644
--- a/dev-python/trio/metadata.xml
+++ b/dev-python/trio/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
   <maintainer type="person">
-    <email>andrewammerlaan@riseup.net</email>
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
   <longdescription lang="en">
diff --git a/dev-python/watchgod/metadata.xml b/dev-python/watchgod/metadata.xml
index a5241af82..4fff6b448 100644
--- a/dev-python/watchgod/metadata.xml
+++ b/dev-python/watchgod/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/games-action/ATLauncher/metadata.xml b/games-action/ATLauncher/metadata.xml
index 1210e7ebc..287879405 100644
--- a/games-action/ATLauncher/metadata.xml
+++ b/games-action/ATLauncher/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/games-action/minecraft-launcher/metadata.xml b/games-action/minecraft-launcher/metadata.xml
index 1210e7ebc..287879405 100644
--- a/games-action/minecraft-launcher/metadata.xml
+++ b/games-action/minecraft-launcher/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/games-action/multimc/metadata.xml b/games-action/multimc/metadata.xml
index 3b3b20b9f..3e76d82c5 100644
--- a/games-action/multimc/metadata.xml
+++ b/games-action/multimc/metadata.xml
@@ -6,7 +6,7 @@
 		<bugs-to>https://github.com/MultiMC/MultiMC5/issues</bugs-to>
 	</upstream>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<longdescription>
diff --git a/games-action/technic-launcher/metadata.xml b/games-action/technic-launcher/metadata.xml
index 1210e7ebc..287879405 100644
--- a/games-action/technic-launcher/metadata.xml
+++ b/games-action/technic-launcher/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/games-util/NotEnoughProduction/metadata.xml b/games-util/NotEnoughProduction/metadata.xml
index 1210e7ebc..287879405 100644
--- a/games-util/NotEnoughProduction/metadata.xml
+++ b/games-util/NotEnoughProduction/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/kde-misc/skanpage/metadata.xml b/kde-misc/skanpage/metadata.xml
index 1210e7ebc..287879405 100644
--- a/kde-misc/skanpage/metadata.xml
+++ b/kde-misc/skanpage/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-tv/droidcam/metadata.xml b/media-tv/droidcam/metadata.xml
index 85aeafda6..e86e346b2 100644
--- a/media-tv/droidcam/metadata.xml
+++ b/media-tv/droidcam/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<use>
diff --git a/media-video/syncplay/files/syncplay-change-alignment-operator.patch b/media-video/syncplay/files/syncplay-change-alignment-operator.patch
index 15c9f67ab..bccdeeae4 100644
--- a/media-video/syncplay/files/syncplay-change-alignment-operator.patch
+++ b/media-video/syncplay/files/syncplay-change-alignment-operator.patch
@@ -1,5 +1,5 @@
 From 61584550ca734d2f3fa3b811d73f2cebd2b7f30f Mon Sep 17 00:00:00 2001
-From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 Date: Thu, 8 Oct 2020 08:37:58 +0200
 Subject: [PATCH] replace & with | in Alignment, visually identical
 
diff --git a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch
index 8caef4955..830239924 100644
--- a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch
+++ b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit.patch
@@ -1,5 +1,5 @@
 From b0e018d0cda148ef8dba07857fcbe8d751800992 Mon Sep 17 00:00:00 2001
-From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 Date: Thu, 8 Oct 2020 08:47:44 +0200
 Subject: [PATCH] make conversion from QPixmap to QIcon explicit
 
diff --git a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch
index 85b61ea4d..561895069 100644
--- a/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch
+++ b/media-video/syncplay/files/syncplay-make-qpixmap-to-qicon-conversion-explicit2.patch
@@ -1,5 +1,5 @@
 From b0e018d0cda148ef8dba07857fcbe8d751800992 Mon Sep 17 00:00:00 2001
-From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 Date: Thu, 8 Oct 2020 08:47:44 +0200
 Subject: [PATCH] make conversion from QPixmap to QIcon explicit
 
diff --git a/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch b/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch
index 822b21b81..a88da5e00 100644
--- a/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch
+++ b/media-video/syncplay/files/syncplay-use-lambda-to-connect-behind-wrapper.patch
@@ -1,5 +1,5 @@
 From f880d4773238a31ac7046ff290910a4ff4920d53 Mon Sep 17 00:00:00 2001
-From: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 Date: Thu, 8 Oct 2020 11:41:41 +0200
 Subject: [PATCH] use lambda when connect() to function with @wrapper
 
diff --git a/media-video/syncplay/metadata.xml b/media-video/syncplay/metadata.xml
index ed27ca4d2..70e1a55fb 100644
--- a/media-video/syncplay/metadata.xml
+++ b/media-video/syncplay/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<use>
diff --git a/media-video/vidify-audiosync/metadata.xml b/media-video/vidify-audiosync/metadata.xml
index a878754a0..9bf31b63f 100644
--- a/media-video/vidify-audiosync/metadata.xml
+++ b/media-video/vidify-audiosync/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/media-video/vidify/metadata.xml b/media-video/vidify/metadata.xml
index bb03a0b0b..81cc13213 100644
--- a/media-video/vidify/metadata.xml
+++ b/media-video/vidify/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<use>
diff --git a/net-im/rocketchat-desktop-bin/metadata.xml b/net-im/rocketchat-desktop-bin/metadata.xml
index 49aa87d46..355f96259 100644
--- a/net-im/rocketchat-desktop-bin/metadata.xml
+++ b/net-im/rocketchat-desktop-bin/metadata.xml
@@ -6,7 +6,7 @@
 		<bugs-to>https://github.com/RocketChat/Rocket.Chat.Electron/issues</bugs-to>
 	</upstream>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-im/ruqola/metadata.xml b/net-im/ruqola/metadata.xml
index 4ce2ed7ad..cbf38d3d7 100644
--- a/net-im/ruqola/metadata.xml
+++ b/net-im/ruqola/metadata.xml
@@ -6,7 +6,7 @@
 		<bugs-to>https://bugs.kde.org</bugs-to>
 	</upstream>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<use>
diff --git a/net-im/whatsapp-desktop-bin/metadata.xml b/net-im/whatsapp-desktop-bin/metadata.xml
index 032fd7c66..61d3b6a82 100644
--- a/net-im/whatsapp-desktop-bin/metadata.xml
+++ b/net-im/whatsapp-desktop-bin/metadata.xml
@@ -6,7 +6,7 @@
 		<bugs-to>https://github.com/oOthkOo/whatsapp-desktop/issues</bugs-to>
 	</upstream>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-im/whatsapp-for-linux/metadata.xml b/net-im/whatsapp-for-linux/metadata.xml
index f0c01872f..2e14d68ad 100644
--- a/net-im/whatsapp-for-linux/metadata.xml
+++ b/net-im/whatsapp-for-linux/metadata.xml
@@ -6,7 +6,7 @@
 		<bugs-to>https://github.com/eneshecan/whatsapp-for-linux/issues</bugs-to>
 	</upstream>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/lyrics-in-terminal/metadata.xml b/net-misc/lyrics-in-terminal/metadata.xml
index 628ab2017..651e2156c 100644
--- a/net-misc/lyrics-in-terminal/metadata.xml
+++ b/net-misc/lyrics-in-terminal/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/net-misc/lyricwikia/metadata.xml b/net-misc/lyricwikia/metadata.xml
index 628ab2017..651e2156c 100644
--- a/net-misc/lyricwikia/metadata.xml
+++ b/net-misc/lyricwikia/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
     <maintainer type="person">
-        <email>andrewammerlaan@riseup.net</email>
+        <email>andrewammerlaan@gentoo.org</email>
         <name>Andrew Ammerlaan</name>
     </maintainer>
 </pkgmetadata>
diff --git a/net-vpn/riseup-vpn/metadata.xml b/net-vpn/riseup-vpn/metadata.xml
index d678da1a4..f54785446 100644
--- a/net-vpn/riseup-vpn/metadata.xml
+++ b/net-vpn/riseup-vpn/metadata.xml
@@ -3,7 +3,7 @@
 
 <pkgmetadata>
 	<maintainer type="person">
-		<email>andrewammerlaan@riseup.net</email>
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<upstream>
diff --git a/profiles/package.mask b/profiles/package.mask
index f5e01cff4..c0758b641 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,7 +1,7 @@
 # Theo Anderson <telans@posteo.de> (2021-01-04)
 # SELinux profiles do not support systemd
 #
-# Andrew Ammerlaan <andrewammerlaan@riseup.net> (2021-03-29)
+# Andrew Ammerlaan <andrewammerlaan@gentoo.org> (2021-03-29)
 # Per profile masking in an overlay is currently not working
 # with pkgcore/pkgdev/pkgcheck. Masking this for all profiles
 # as a workaround that both makes repoman happy and works with
diff --git a/scripts/check-duplicates.sh b/scripts/check-duplicates.sh
index ddd63fa68..f23478ce6 100755
--- a/scripts/check-duplicates.sh
+++ b/scripts/check-duplicates.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-# Maintainer: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 # Maintainer: Theo Anderson <telans@posteo.de>
 #
 # This checks for potential and exact package matches within an overlay & ::gentoo
diff --git a/scripts/setup-and-run-repoman.sh b/scripts/setup-and-run-repoman.sh
index f6607549d..f9e45a9cf 100755
--- a/scripts/setup-and-run-repoman.sh
+++ b/scripts/setup-and-run-repoman.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-# Maintainer: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 #
 # This sets up repoman and runs the latest version
 #
diff --git a/scripts/setup-master-gentoo.sh b/scripts/setup-master-gentoo.sh
index a2939721a..1a19d18df 100755
--- a/scripts/setup-master-gentoo.sh
+++ b/scripts/setup-master-gentoo.sh
@@ -1,5 +1,5 @@
 #! /usr/bin/env bash
-# Maintainer: Andrew Ammerlaan <andrewammerlaan@riseup.net>
+# Maintainer: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
 #
 # Fetch and setup the latest ::gentoo