diff --git a/acct-group/bitlbee/metadata.xml b/acct-group/bitlbee/metadata.xml
index c74515d20dbe0..15cf2ff7a5211 100644
--- a/acct-group/bitlbee/metadata.xml
+++ b/acct-group/bitlbee/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-group/epmd/metadata.xml b/acct-group/epmd/metadata.xml
index c74515d20dbe0..15cf2ff7a5211 100644
--- a/acct-group/epmd/metadata.xml
+++ b/acct-group/epmd/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-group/rspamd/metadata.xml b/acct-group/rspamd/metadata.xml
index 79c983af8c3e9..3128bc705301a 100644
--- a/acct-group/rspamd/metadata.xml
+++ b/acct-group/rspamd/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-group/synapse/metadata.xml b/acct-group/synapse/metadata.xml
index c74515d20dbe0..15cf2ff7a5211 100644
--- a/acct-group/synapse/metadata.xml
+++ b/acct-group/synapse/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/bitlbee/metadata.xml b/acct-user/bitlbee/metadata.xml
index c74515d20dbe0..15cf2ff7a5211 100644
--- a/acct-user/bitlbee/metadata.xml
+++ b/acct-user/bitlbee/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/epmd/metadata.xml b/acct-user/epmd/metadata.xml
index c74515d20dbe0..15cf2ff7a5211 100644
--- a/acct-user/epmd/metadata.xml
+++ b/acct-user/epmd/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/rspamd/metadata.xml b/acct-user/rspamd/metadata.xml
index 79c983af8c3e9..3128bc705301a 100644
--- a/acct-user/rspamd/metadata.xml
+++ b/acct-user/rspamd/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/acct-user/synapse/metadata.xml b/acct-user/synapse/metadata.xml
index c74515d20dbe0..15cf2ff7a5211 100644
--- a/acct-user/synapse/metadata.xml
+++ b/acct-user/synapse/metadata.xml
@@ -1,12 +1,8 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
index b5460834c0075..42b405dcafb78 100644
--- a/app-admin/clustershell/metadata.xml
+++ b/app-admin/clustershell/metadata.xml
@@ -5,14 +5,10 @@
monsieurp@gentoo.org
Patrice Clement
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
ClusterShell
cea-hpc/clustershell
diff --git a/dev-cpp/doctest/metadata.xml b/dev-cpp/doctest/metadata.xml
index 02076edda235a..da9d59df6a91d 100644
--- a/dev-cpp/doctest/metadata.xml
+++ b/dev-cpp/doctest/metadata.xml
@@ -1,14 +1,10 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
doctest/doctest
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index a48bd437f9f13..74cc4cf994f04 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -1,18 +1,14 @@
-
- arkamar@atlas.cz
+
+ arkamar@gentoo.org
Petr Vaněk
sam@gentoo.org
Sam James
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-