*/*: Update my e-mail address

Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>

44 files changed, 122 insertions, 266 deletions

diff --git a/acct-group/snapserver/metadata.xml b/acct-group/snapserver/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/acct-group/snapserver/metadata.xml
+++ b/acct-group/snapserver/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/snapclient/metadata.xml b/acct-user/snapclient/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/acct-user/snapclient/metadata.xml
+++ b/acct-user/snapclient/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/acct-user/snapserver/metadata.xml b/acct-user/snapserver/metadata.xml
index 8f44432ba478..ce9d0cf14002 100644
--- a/acct-user/snapserver/metadata.xml
+++ b/acct-user/snapserver/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>jsmolic@gentoo.org</email>
-		<name>Jakov Smolic</name>
+		<name>Jakov Smolić</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml
index aca54e70bbf2..a8df410a1ef5 100644
--- a/app-admin/gixy/metadata.xml
+++ b/app-admin/gixy/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">yandex/gixy</remote-id>
diff --git a/app-crypt/nwipe/metadata.xml b/app-crypt/nwipe/metadata.xml
index 007c834756f4..dfa7e184c067 100644
--- a/app-crypt/nwipe/metadata.xml
+++ b/app-crypt/nwipe/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">martijnvanbrummelen/nwipe</remote-id>
diff --git a/app-crypt/scrypt/metadata.xml b/app-crypt/scrypt/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/app-crypt/scrypt/metadata.xml
+++ b/app-crypt/scrypt/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-cpp/aixlog/metadata.xml b/dev-cpp/aixlog/metadata.xml
index 9dbe74b38688..ddf446bf81f9 100644
--- a/dev-cpp/aixlog/metadata.xml
+++ b/dev-cpp/aixlog/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<maintainer status="active">
diff --git a/dev-cpp/popl/metadata.xml b/dev-cpp/popl/metadata.xml
index f8460c972b8a..ebdd4ab67ba1 100644
--- a/dev-cpp/popl/metadata.xml
+++ b/dev-cpp/popl/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<maintainer status="active">
diff --git a/dev-cpp/sparsehash/metadata.xml b/dev-cpp/sparsehash/metadata.xml
index 4d034ae1f843..c032dbd97ffa 100644
--- a/dev-cpp/sparsehash/metadata.xml
+++ b/dev-cpp/sparsehash/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">sparsehash/sparsehash</remote-id>
diff --git a/dev-db/pgcli/metadata.xml b/dev-db/pgcli/metadata.xml
index 4dea25618d51..82b5a8303b78 100644
--- a/dev-db/pgcli/metadata.xml
+++ b/dev-db/pgcli/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-embedded/avra/metadata.xml b/dev-embedded/avra/metadata.xml
index cdb75a2d8c77..7ecadc0b2e41 100644
--- a/dev-embedded/avra/metadata.xml
+++ b/dev-embedded/avra/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">hsoft/avra</remote-id>
diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index 3b16c1944e7b..707f686dc7f3 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <maintainer type="person" proxied="yes">
     <email>luka.perkov@sartura.hr</email>
diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index 1c0c4078889f..13e80a83581f 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<longdescription lang="en">
 		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 6d821181d635..ce9d0cf14002 100644
--- a/dev-libs/npth/metadata.xml
+++ b/dev-libs/npth/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index 6e3e64f2f795..9e2162740edd 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-			<email>jakov.smolic@sartura.hr</email>
-			<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-			<email>proxy-maint@gentoo.org</email>
-			<name>Proxy Maintainers</name>
+	<maintainer type="person">
+			<email>jsmolic@gentoo.org</email>
+			<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">troydhanson/uthash</remote-id>
diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
index 8eabfa2b9665..1acd686663ab 100644
--- a/dev-python/bluelet/metadata.xml
+++ b/dev-python/bluelet/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<longdescription lang="en">
diff --git a/dev-python/cleo/metadata.xml b/dev-python/cleo/metadata.xml
index 22e0263a3469..c67347339807 100644
--- a/dev-python/cleo/metadata.xml
+++ b/dev-python/cleo/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-python/clikit/metadata.xml b/dev-python/clikit/metadata.xml
index b4ae56656370..22cae510583b 100644
--- a/dev-python/clikit/metadata.xml
+++ b/dev-python/clikit/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-python/crashtest/metadata.xml b/dev-python/crashtest/metadata.xml
index 0429414d77e3..d138e30a99e1 100644
--- a/dev-python/crashtest/metadata.xml
+++ b/dev-python/crashtest/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-python/pastel/metadata.xml b/dev-python/pastel/metadata.xml
index 042366cde629..371184c5784d 100644
--- a/dev-python/pastel/metadata.xml
+++ b/dev-python/pastel/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-python/pendulum/metadata.xml b/dev-python/pendulum/metadata.xml
index 46260309e735..59e08873c7c5 100644
--- a/dev-python/pendulum/metadata.xml
+++ b/dev-python/pendulum/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-python/pylev/metadata.xml b/dev-python/pylev/metadata.xml
index a914219acbff..7ae5d58eef0b 100644
--- a/dev-python/pylev/metadata.xml
+++ b/dev-python/pylev/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
diff --git a/dev-python/pytzdata/metadata.xml b/dev-python/pytzdata/metadata.xml
index 9413c73073ef..056098765a56 100644
--- a/dev-python/pytzdata/metadata.xml
+++ b/dev-python/pytzdata/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 1259638cdb5a..81deb5a96113 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">cgdb/cgdb</remote-id>
diff --git a/dev-util/clippy/metadata.xml b/dev-util/clippy/metadata.xml
index af7e64c3e634..b6c4188cd812 100644
--- a/dev-util/clippy/metadata.xml
+++ b/dev-util/clippy/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">FRRouting/frr</remote-id>
diff --git a/dev-util/cpputest/metadata.xml b/dev-util/cpputest/metadata.xml
index e782d2cca8a4..cf13fffbb094 100644
--- a/dev-util/cpputest/metadata.xml
+++ b/dev-util/cpputest/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">cpputest/cpputest</remote-id>
diff --git a/dev-util/ply/metadata.xml b/dev-util/ply/metadata.xml
index b6666629264a..9d5989a40686 100644
--- a/dev-util/ply/metadata.xml
+++ b/dev-util/ply/metadata.xml
@@ -4,9 +4,9 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <maintainer type="person" proxied="yes">
     <email>luka.perkov@sartura.hr</email>
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 6a8df65e8958..9e7700af286c 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<use>
 		<flag name="tools">Build command-line tools</flag>
diff --git a/media-libs/libheif/metadata.xml b/media-libs/libheif/metadata.xml
index b6cd60663a54..1827eeb6bb11 100644
--- a/media-libs/libheif/metadata.xml
+++ b/media-libs/libheif/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<use>
 	<flag name="aom">Use <pkg>media-libs/libaom</pkg> for AVIF encoding/decoding</flag>
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
index 7300f7cbd092..539288c2a657 100644
--- a/media-sound/snapcast/metadata.xml
+++ b/media-sound/snapcast/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<use>
 		<flag name="client">Build and install Snapcast client component</flag>
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 80e7bcd54427..8fa766dd860f 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>jakov.smolic@sartura.hr</email>
-    <name>Jakov Smolic</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="person">
+    <email>jsmolic@gentoo.org</email>
+    <name>Jakov Smolić</name>
   </maintainer>
   <longdescription>
 ZMap is an open-source network scanner that enables researchers to easily 
diff --git a/net-dns/https_dns_proxy/metadata.xml b/net-dns/https_dns_proxy/metadata.xml
index ae5c44f112d5..06229db1c707 100644
--- a/net-dns/https_dns_proxy/metadata.xml
+++ b/net-dns/https_dns_proxy/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">aarond10/dns-over-https-proxy</remote-id>
diff --git a/net-irc/quasselgrep/metadata.xml b/net-irc/quasselgrep/metadata.xml
index 11fb66f07328..f75c46900527 100644
--- a/net-irc/quasselgrep/metadata.xml
+++ b/net-irc/quasselgrep/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/fish-face/quasselgrep/issues</bugs-to>
diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml
index bb8573337939..0451911fcc76 100644
--- a/net-libs/biblesync/metadata.xml
+++ b/net-libs/biblesync/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>marecki@gentoo.org</email>
diff --git a/net-libs/libnetconf2/metadata.xml b/net-libs/libnetconf2/metadata.xml
index 4856bf68220b..5c10720002ea 100644
--- a/net-libs/libnetconf2/metadata.xml
+++ b/net-libs/libnetconf2/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">CESNET/libnetconf2</remote-id>
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index 6f7b1d027276..bbc5761a4734 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -5,9 +5,9 @@
 		<email>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>luka.perkov@sartura.hr</email>
diff --git a/net-libs/libyang/metadata.xml b/net-libs/libyang/metadata.xml
index 7e80d8aa1297..44a385e3211a 100644
--- a/net-libs/libyang/metadata.xml
+++ b/net-libs/libyang/metadata.xml
@@ -5,13 +5,9 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">CESNET/libyang</remote-id>
diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index dc5cd64d6f4e..775a1ad73731 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<use>
 		<flag name="grpc">Enable gRPC plugin</flag>
diff --git a/net-misc/mstpd/metadata.xml b/net-misc/mstpd/metadata.xml
index e64fa059088e..30b6da49cd7a 100644
--- a/net-misc/mstpd/metadata.xml
+++ b/net-misc/mstpd/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">mstpd/mstpd</remote-id>
diff --git a/net-misc/netopeer2/metadata.xml b/net-misc/netopeer2/metadata.xml
index 976b10aaa62d..471d08063892 100644
--- a/net-misc/netopeer2/metadata.xml
+++ b/net-misc/netopeer2/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">CESNET/netopeer2</remote-id>
diff --git a/net-misc/sysrepo/metadata.xml b/net-misc/sysrepo/metadata.xml
index a5c3a6e9d3c2..ecaa125ea637 100644
--- a/net-misc/sysrepo/metadata.xml
+++ b/net-misc/sysrepo/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">sysrepo/sysrepo</remote-id>
diff --git a/net-vpn/6tunnel/metadata.xml b/net-vpn/6tunnel/metadata.xml
index 6d821181d635..ce9d0cf14002 100644
--- a/net-vpn/6tunnel/metadata.xml
+++ b/net-vpn/6tunnel/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="person">
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/bmake/metadata.xml b/sys-devel/bmake/metadata.xml
index 97c59ff25556..ee2c64618d56 100644
--- a/sys-devel/bmake/metadata.xml
+++ b/sys-devel/bmake/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>soap@gentoo.org</email>
diff --git a/sys-devel/elftoolchain/metadata.xml b/sys-devel/elftoolchain/metadata.xml
index cebcfd378268..e8c98918df92 100644
--- a/sys-devel/elftoolchain/metadata.xml
+++ b/sys-devel/elftoolchain/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>jsmolic@gentoo.org</email>
+		<name>Jakov Smolić</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">elftoolchain</remote-id>