diff --git a/acct-group/snapserver/metadata.xml b/acct-group/snapserver/metadata.xml
index 6d821181d6352..ce9d0cf140022 100644
--- a/acct-group/snapserver/metadata.xml
+++ b/acct-group/snapserver/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/acct-user/snapclient/metadata.xml b/acct-user/snapclient/metadata.xml
index 6d821181d6352..ce9d0cf140022 100644
--- a/acct-user/snapclient/metadata.xml
+++ b/acct-user/snapclient/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/acct-user/snapserver/metadata.xml b/acct-user/snapserver/metadata.xml
index 8f44432ba4780..ce9d0cf140022 100644
--- a/acct-user/snapserver/metadata.xml
+++ b/acct-user/snapserver/metadata.xml
@@ -3,6 +3,6 @@
jsmolic@gentoo.org
- Jakov Smolic
+ Jakov Smolić
diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml
index aca54e70bbf26..a8df410a1ef5e 100644
--- a/app-admin/gixy/metadata.xml
+++ b/app-admin/gixy/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
yandex/gixy
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 007c834756f41..dfa7e184c067f 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
martijnvanbrummelen/nwipe
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index 6d821181d6352..ce9d0cf140022 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-cpp/aixlog/metadata.xml b/dev-cpp/aixlog/metadata.xml
index 9dbe74b38688a..ddf446bf81f95 100644
--- a/dev-cpp/aixlog/metadata.xml
+++ b/dev-cpp/aixlog/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-cpp/popl/metadata.xml b/dev-cpp/popl/metadata.xml
index f8460c972b8a2..ebdd4ab67ba13 100644
--- a/dev-cpp/popl/metadata.xml
+++ b/dev-cpp/popl/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-cpp/sparsehash/metadata.xml b/dev-cpp/sparsehash/metadata.xml
index 4d034ae1f843d..c032dbd97ffa0 100644
--- a/dev-cpp/sparsehash/metadata.xml
+++ b/dev-cpp/sparsehash/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
sparsehash/sparsehash
diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml
index 4dea25618d519..82b5a8303b788 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-embedded/avra/metadata.xml b/dev-embedded/avra/metadata.xml
index cdb75a2d8c77e..7ecadc0b2e41e 100644
--- a/dev-embedded/avra/metadata.xml
+++ b/dev-embedded/avra/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
hsoft/avra
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index 3b16c1944e7bc..707f686dc7f37 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -1,9 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
+
+ jsmolic@gentoo.org
+ Jakov Smolić
luka.perkov@sartura.hr
diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index 1c0c4078889f0..13e80a83581f8 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -6,8 +6,8 @@
Gentoo KDE Project
- jakov.smolic@sartura.hr
- Jakov Smolic
+ jsmolic@gentoo.org
+ Jakov Smolić
libuv is a platform layer for node.js. Its purpose is to abstract
diff --git a/dev-libs/npth/metadata.xml b/dev-libs/npth/metadata.xml
index 6d821181d6352..ce9d0cf140022 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,12 +1,8 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index 6e3e64f2f7959..9e2162740edd9 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
troydhanson/uthash
diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
index 8eabfa2b96651..1acd686663ab6 100644
--- a/dev-python/bluelet/metadata.xml
+++ b/dev-python/bluelet/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml
index 22e0263a34698..c673473398071 100644
--- a/dev-python/cleo/metadata.xml
+++ b/dev-python/cleo/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index b4ae566563701..22cae510583bd 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml
index 0429414d77e3e..d138e30a99e10 100644
--- a/dev-python/crashtest/metadata.xml
+++ b/dev-python/crashtest/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
index 042366cde6294..371184c5784d7 100644
--- a/dev-python/pastel/metadata.xml
+++ b/dev-python/pastel/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
index 46260309e7356..59e08873c7c5f 100644
--- a/dev-python/pendulum/metadata.xml
+++ b/dev-python/pendulum/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
index a914219acbff0..7ae5d58eef0bf 100644
--- a/dev-python/pylev/metadata.xml
+++ b/dev-python/pylev/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
python@gentoo.org
diff --git a/dev-python/pytzdata/metadata.xml b/dev-python/pytzdata/metadata.xml
index 9413c73073ef1..056098765a564 100644
--- a/dev-python/pytzdata/metadata.xml
+++ b/dev-python/pytzdata/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 1259638cdb5ac..81deb5a96113f 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
cgdb/cgdb
diff --git a/dev-util/clippy/metadata.xml b/dev-util/clippy/metadata.xml
index af7e64c3e6347..b6c4188cd8121 100644
--- a/dev-util/clippy/metadata.xml
+++ b/dev-util/clippy/metadata.xml
@@ -2,12 +2,8 @@
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+ jsmolic@gentoo.org
+ Jakov Smolić
FRRouting/frr
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index e782d2cca8a4f..cf13fffbb0946 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić
cpputest/cpputest
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
index b6666629264ab..9d5989a406864 100644
--- a/dev-util/ply/metadata.xml
+++ b/dev-util/ply/metadata.xml
@@ -4,9 +4,9 @@
zmedico@gentoo.org
-
- jakov.smolic@sartura.hr
- Jakov Smolic
+
+ jsmolic@gentoo.org
+ Jakov Smolić
luka.perkov@sartura.hr
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 6a8df65e8958b..9e7700af286c6 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/metadata.xml
@@ -1,13 +1,9 @@
-
- jakov.smolic@sartura.hr
- Jakov Smolic
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
+
+ jsmolic@gentoo.org
+ Jakov Smolić