diff --git a/acct-group/gopher/metadata.xml b/acct-group/gopher/metadata.xml
index e7d95e4ceee30..e91ef31902f92 100644
--- a/acct-group/gopher/metadata.xml
+++ b/acct-group/gopher/metadata.xml
@@ -1,12 +1,8 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
diff --git a/acct-user/gopher/metadata.xml b/acct-user/gopher/metadata.xml
index e7d95e4ceee30..e91ef31902f92 100644
--- a/acct-user/gopher/metadata.xml
+++ b/acct-user/gopher/metadata.xml
@@ -1,12 +1,8 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
diff --git a/app-arch/makeself/metadata.xml b/app-arch/makeself/metadata.xml
index e3be9c7236787..8e783c72a1db2 100644
--- a/app-arch/makeself/metadata.xml
+++ b/app-arch/makeself/metadata.xml
@@ -1,13 +1,9 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
diff --git a/dev-lang/nasm/metadata.xml b/dev-lang/nasm/metadata.xml
index 58fb5e05c1f6d..af856ea306f06 100644
--- a/dev-lang/nasm/metadata.xml
+++ b/dev-lang/nasm/metadata.xml
@@ -1,13 +1,9 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
The Netwide Assembler, NASM, is an 80x86 assembler designed for portability
diff --git a/dev-libs/tree-sitter-bash/metadata.xml b/dev-libs/tree-sitter-bash/metadata.xml
index 32d01ca517bb7..cfc3dcc2ea73a 100644
--- a/dev-libs/tree-sitter-bash/metadata.xml
+++ b/dev-libs/tree-sitter-bash/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-c-sharp/metadata.xml b/dev-libs/tree-sitter-c-sharp/metadata.xml
index 09096aa6cbec7..02f666e7b8e92 100644
--- a/dev-libs/tree-sitter-c-sharp/metadata.xml
+++ b/dev-libs/tree-sitter-c-sharp/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-c/metadata.xml b/dev-libs/tree-sitter-c/metadata.xml
index 2fb30809a7356..fb0cac7dd1c40 100644
--- a/dev-libs/tree-sitter-c/metadata.xml
+++ b/dev-libs/tree-sitter-c/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-cpp/metadata.xml b/dev-libs/tree-sitter-cpp/metadata.xml
index ab56d355774c0..98219c3cf6940 100644
--- a/dev-libs/tree-sitter-cpp/metadata.xml
+++ b/dev-libs/tree-sitter-cpp/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-css/metadata.xml b/dev-libs/tree-sitter-css/metadata.xml
index 6e7834e213c1c..4a2ac735d1ee2 100644
--- a/dev-libs/tree-sitter-css/metadata.xml
+++ b/dev-libs/tree-sitter-css/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-embedded-template/metadata.xml b/dev-libs/tree-sitter-embedded-template/metadata.xml
index edb56989e7c5a..95926c8ae18e7 100644
--- a/dev-libs/tree-sitter-embedded-template/metadata.xml
+++ b/dev-libs/tree-sitter-embedded-template/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-go/metadata.xml b/dev-libs/tree-sitter-go/metadata.xml
index f72d829c4128c..a57a99683ab01 100644
--- a/dev-libs/tree-sitter-go/metadata.xml
+++ b/dev-libs/tree-sitter-go/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-haskell/metadata.xml b/dev-libs/tree-sitter-haskell/metadata.xml
index c2c1fae88cf0e..babe5b02aa102 100644
--- a/dev-libs/tree-sitter-haskell/metadata.xml
+++ b/dev-libs/tree-sitter-haskell/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-html/metadata.xml b/dev-libs/tree-sitter-html/metadata.xml
index acc1cbdd1c4f4..3523175e50405 100644
--- a/dev-libs/tree-sitter-html/metadata.xml
+++ b/dev-libs/tree-sitter-html/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-java/metadata.xml b/dev-libs/tree-sitter-java/metadata.xml
index 4c98a62d0f915..ab4809aa51a7b 100644
--- a/dev-libs/tree-sitter-java/metadata.xml
+++ b/dev-libs/tree-sitter-java/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-javascript/metadata.xml b/dev-libs/tree-sitter-javascript/metadata.xml
index e4ca3c1b4c143..0846068ba5d86 100644
--- a/dev-libs/tree-sitter-javascript/metadata.xml
+++ b/dev-libs/tree-sitter-javascript/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-jsdoc/metadata.xml b/dev-libs/tree-sitter-jsdoc/metadata.xml
index ec13b7ca75b76..0947bc05e5f02 100644
--- a/dev-libs/tree-sitter-jsdoc/metadata.xml
+++ b/dev-libs/tree-sitter-jsdoc/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-json/metadata.xml b/dev-libs/tree-sitter-json/metadata.xml
index 54551edf7eea7..0e1551210dfcd 100644
--- a/dev-libs/tree-sitter-json/metadata.xml
+++ b/dev-libs/tree-sitter-json/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-julia/metadata.xml b/dev-libs/tree-sitter-julia/metadata.xml
index c9980de7efc01..781c30634bf9d 100644
--- a/dev-libs/tree-sitter-julia/metadata.xml
+++ b/dev-libs/tree-sitter-julia/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-meta/metadata.xml b/dev-libs/tree-sitter-meta/metadata.xml
index 07830709cc3eb..6e7f9e7ff0331 100644
--- a/dev-libs/tree-sitter-meta/metadata.xml
+++ b/dev-libs/tree-sitter-meta/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-ocaml/metadata.xml b/dev-libs/tree-sitter-ocaml/metadata.xml
index 38ac08cf86e46..681978881386e 100644
--- a/dev-libs/tree-sitter-ocaml/metadata.xml
+++ b/dev-libs/tree-sitter-ocaml/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-php/metadata.xml b/dev-libs/tree-sitter-php/metadata.xml
index e11305e07a959..0f4f3a9a2eeb2 100644
--- a/dev-libs/tree-sitter-php/metadata.xml
+++ b/dev-libs/tree-sitter-php/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-python/metadata.xml b/dev-libs/tree-sitter-python/metadata.xml
index 64809d1b4963b..1150500b1da52 100644
--- a/dev-libs/tree-sitter-python/metadata.xml
+++ b/dev-libs/tree-sitter-python/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-ql/metadata.xml b/dev-libs/tree-sitter-ql/metadata.xml
index 1933595528512..b500ca7f89540 100644
--- a/dev-libs/tree-sitter-ql/metadata.xml
+++ b/dev-libs/tree-sitter-ql/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-regex/metadata.xml b/dev-libs/tree-sitter-regex/metadata.xml
index a23cbbe1237e6..e052fd0a6b1bc 100644
--- a/dev-libs/tree-sitter-regex/metadata.xml
+++ b/dev-libs/tree-sitter-regex/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-ruby/metadata.xml b/dev-libs/tree-sitter-ruby/metadata.xml
index 920a37c3ce40f..f1cc3e07c912a 100644
--- a/dev-libs/tree-sitter-ruby/metadata.xml
+++ b/dev-libs/tree-sitter-ruby/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-rust/metadata.xml b/dev-libs/tree-sitter-rust/metadata.xml
index b82170949bb80..78be01dc65acc 100644
--- a/dev-libs/tree-sitter-rust/metadata.xml
+++ b/dev-libs/tree-sitter-rust/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-scala/metadata.xml b/dev-libs/tree-sitter-scala/metadata.xml
index 521d91df4f591..ea3cfbe901d48 100644
--- a/dev-libs/tree-sitter-scala/metadata.xml
+++ b/dev-libs/tree-sitter-scala/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-tsq/metadata.xml b/dev-libs/tree-sitter-tsq/metadata.xml
index ee14ccfa4e76f..54cdf7d9be5d7 100644
--- a/dev-libs/tree-sitter-tsq/metadata.xml
+++ b/dev-libs/tree-sitter-tsq/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-libs/tree-sitter-typescript/metadata.xml b/dev-libs/tree-sitter-typescript/metadata.xml
index f486929bd436f..09539cbda1daf 100644
--- a/dev-libs/tree-sitter-typescript/metadata.xml
+++ b/dev-libs/tree-sitter-typescript/metadata.xml
@@ -1,11 +1,11 @@
-
- matt@offtopica.uk
+
+ matthew@gentoo.org
Matthew Smith
-
+
sarnex@gentoo.org
Nick Sarnie
diff --git a/dev-python/kaitaistruct/metadata.xml b/dev-python/kaitaistruct/metadata.xml
index 9b67c4915a907..03df5426a71b9 100644
--- a/dev-python/kaitaistruct/metadata.xml
+++ b/dev-python/kaitaistruct/metadata.xml
@@ -2,13 +2,9 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
Kaitai Struct is a declarative language used for
diff --git a/dev-scheme/chez/metadata.xml b/dev-scheme/chez/metadata.xml
index e539d1309d731..a9405d1c04382 100644
--- a/dev-scheme/chez/metadata.xml
+++ b/dev-scheme/chez/metadata.xml
@@ -2,9 +2,9 @@
-
- matt@offtopica.uk
- Matt Smith
+
+ matthew@gentoo.org
+ Matthew Smith
scheme@gentoo.org
diff --git a/dev-util/rebar-bin/metadata.xml b/dev-util/rebar-bin/metadata.xml
index b1d2cf993dc1a..851f4e99775b6 100644
--- a/dev-util/rebar-bin/metadata.xml
+++ b/dev-util/rebar-bin/metadata.xml
@@ -2,13 +2,9 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
Rebar3 is an Erlang tool that makes it easy to create, develop, and
diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index a47ba60ed5555..0cb8d1bc165bd 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,13 +1,9 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
'mu' is a set of command-line tools for Linux/Unix that enable you to quickly find the e-mails you
diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml
index ef42757472dad..d6dbc3c876eab 100644
--- a/net-misc/gofish/metadata.xml
+++ b/net-misc/gofish/metadata.xml
@@ -1,13 +1,9 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
gofish
diff --git a/net-misc/xmrig/metadata.xml b/net-misc/xmrig/metadata.xml
index c01c676279c9d..37e999606f7e5 100644
--- a/net-misc/xmrig/metadata.xml
+++ b/net-misc/xmrig/metadata.xml
@@ -1,9 +1,9 @@
-
- matt@offtopica.uk
- Matt Smith
+
+ matthew@gentoo.org
+ Matthew Smith
telans@posteo.de
diff --git a/x11-terms/zutty/metadata.xml b/x11-terms/zutty/metadata.xml
index 6e6c2928381be..081fbf57c876e 100644
--- a/x11-terms/zutty/metadata.xml
+++ b/x11-terms/zutty/metadata.xml
@@ -1,13 +1,9 @@
-
- matt@offtopica.uk
- Matt Smith
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ matthew@gentoo.org
+ Matthew Smith
Zutty is a terminal emulator for the X Window System, functionally