[gentoo-commits] repo/gentoo:master commit in: acct-user/collectd/, dev-python/puremagic/, dev-libs/librdkafka/, ...

[Joonas Niilola]

commit:     9061b2f23187fd1a2c35a705f34623f14170cde6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 07:53:30 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 08:08:12 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9061b2f2

*/*: reassign whissi's packages

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 acct-group/collectd/metadata.xml                     | 5 +----
 acct-group/dehydrated/metadata.xml                   | 4 ----
 acct-group/fcron/metadata.xml                        | 4 ----
 acct-group/fritzbox_smarthome_exporter/metadata.xml  | 5 +----
 acct-group/mysqld_exporter/metadata.xml              | 5 +----
 acct-group/nginx/metadata.xml                        | 5 +----
 acct-group/pipewire/metadata.xml                     | 4 ----
 acct-group/sabnzbd/metadata.xml                      | 5 +----
 acct-group/unbound/metadata.xml                      | 4 ----
 acct-user/collectd/metadata.xml                      | 5 +----
 acct-user/dehydrated/metadata.xml                    | 4 ----
 acct-user/fcron/metadata.xml                         | 4 ----
 acct-user/fritzbox_smarthome_exporter/metadata.xml   | 5 +----
 acct-user/mysqld_exporter/metadata.xml               | 5 +----
 acct-user/nginx/metadata.xml                         | 5 +----
 acct-user/pipewire/metadata.xml                      | 4 ----
 acct-user/sabnzbd/metadata.xml                       | 5 +----
 acct-user/unbound/metadata.xml                       | 4 ----
 app-admin/cli53/metadata.xml                         | 5 +----
 app-admin/rsyslog/metadata.xml                       | 5 +----
 app-arch/rar/metadata.xml                            | 5 +----
 app-arch/unrar/metadata.xml                          | 4 ----
 app-backup/tarsnap/metadata.xml                      | 5 +----
 app-crypt/dehydrated/metadata.xml                    | 4 ----
 app-metrics/collectd/metadata.xml                    | 5 +----
 app-metrics/fritzbox_smarthome_exporter/metadata.xml | 5 +----
 app-metrics/mysqld_exporter/metadata.xml             | 5 +----
 app-portage/elicense/metadata.xml                    | 5 +----
 app-portage/golop/metadata.xml                       | 5 +----
 app-text/vgrep/metadata.xml                          | 5 +----
 dev-libs/libee/metadata.xml                          | 5 +----
 dev-libs/libestr/metadata.xml                        | 5 +----
 dev-libs/libfastjson/metadata.xml                    | 5 +----
 dev-libs/liblogging/metadata.xml                     | 4 ----
 dev-libs/liblognorm/metadata.xml                     | 5 +----
 dev-libs/librdkafka/metadata.xml                     | 5 +----
 dev-libs/librelp/metadata.xml                        | 5 +----
 dev-libs/libxmlb/metadata.xml                        | 4 ----
 dev-php/realpath_turbo/metadata.xml                  | 4 ----
 dev-python/PyRSS2Gen/metadata.xml                    | 5 +----
 dev-python/fritzconnection/metadata.xml              | 4 ----
 dev-python/puremagic/metadata.xml                    | 4 ----
 dev-python/pymilter/metadata.xml                     | 4 ----
 dev-python/pyphen/metadata.xml                       | 4 ----
 dev-python/sabyenc/metadata.xml                      | 5 +----
 dev-python/ws4py/metadata.xml                        | 5 +----
 media-video/pipewire/metadata.xml                    | 4 ----
 net-dns/dnssec-root/metadata.xml                     | 4 ----
 net-dns/dnsviz/metadata.xml                          | 4 ----
 net-dns/unbound/metadata.xml                         | 4 ----
 net-firewall/shorewall/metadata.xml                  | 4 ----
 net-irc/znc-clientbuffer/metadata.xml                | 5 +----
 net-irc/znc-igloo-push/metadata.xml                  | 5 +----
 net-irc/znc-playback/metadata.xml                    | 5 +----
 net-libs/liboping/metadata.xml                       | 5 +----
 net-libs/zeromq/metadata.xml                         | 5 +----
 net-misc/httpstat/metadata.xml                       | 5 +----
 net-nntp/sabnzbd/metadata.xml                        | 5 +----
 sec-keys/openpgp-keys-unbound/metadata.xml           | 4 ----
 sys-apps/fwupd-efi/metadata.xml                      | 4 ----
 sys-apps/fwupd/metadata.xml                          | 4 ----
 sys-apps/hponcfg/metadata.xml                        | 5 +----
 sys-apps/lm-sensors/metadata.xml                     | 4 ----
 sys-block/f3/metadata.xml                            | 5 +----
 sys-block/hpacucli/metadata.xml                      | 5 +----
 sys-block/hpssacli/metadata.xml                      | 5 +----
 sys-block/storcli/metadata.xml                       | 5 +----
 sys-fs/ncdu/metadata.xml                             | 5 +----
 sys-libs/libfaketime/metadata.xml                    | 5 +----
 sys-libs/libsmbios/metadata.xml                      | 4 ----
 sys-process/fcron/metadata.xml                       | 4 ----
 sys-process/incron/metadata.xml                      | 5 +----
 www-apache/mod_maxminddb/metadata.xml                | 4 ----
 www-apps/nextcloud-notify_push/metadata.xml          | 5 +----
 www-apps/nikola/metadata.xml                         | 5 +----
 www-servers/nginx/metadata.xml                       | 5 +----
 76 files changed, 47 insertions(+), 304 deletions(-)

diff --git a/acct-group/collectd/metadata.xml b/acct-group/collectd/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/collectd/metadata.xml
+++ b/acct-group/collectd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-group/dehydrated/metadata.xml b/acct-group/dehydrated/metadata.xml
index a442f39eb095..0885e8a081b0 100644
--- a/acct-group/dehydrated/metadata.xml
+++ b/acct-group/dehydrated/metadata.xml
@@ -4,8 +4,4 @@
 	<maintainer type="person">
 		<email>mschiff@g.o</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/acct-group/fcron/metadata.xml b/acct-group/fcron/metadata.xml
index 87336d400336..489e730c1c90 100644
--- a/acct-group/fcron/metadata.xml
+++ b/acct-group/fcron/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>blueness@g.o</email>
 		<name>Anthony G. Basile</name>

diff --git a/acct-group/fritzbox_smarthome_exporter/metadata.xml b/acct-group/fritzbox_smarthome_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/fritzbox_smarthome_exporter/metadata.xml
+++ b/acct-group/fritzbox_smarthome_exporter/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-group/mysqld_exporter/metadata.xml b/acct-group/mysqld_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/mysqld_exporter/metadata.xml
+++ b/acct-group/mysqld_exporter/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-group/nginx/metadata.xml b/acct-group/nginx/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/nginx/metadata.xml
+++ b/acct-group/nginx/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-group/pipewire/metadata.xml b/acct-group/pipewire/metadata.xml
index 818bc8df5664..6d27fca777f7 100644
--- a/acct-group/pipewire/metadata.xml
+++ b/acct-group/pipewire/metadata.xml
@@ -13,8 +13,4 @@
 		<email>asturm@g.o</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/acct-group/sabnzbd/metadata.xml b/acct-group/sabnzbd/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-group/sabnzbd/metadata.xml
+++ b/acct-group/sabnzbd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-group/unbound/metadata.xml b/acct-group/unbound/metadata.xml
index a3bdd9f74bf4..f63250c09310 100644
--- a/acct-group/unbound/metadata.xml
+++ b/acct-group/unbound/metadata.xml
@@ -5,8 +5,4 @@
 		<email>mschiff@g.o</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/acct-user/collectd/metadata.xml b/acct-user/collectd/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/collectd/metadata.xml
+++ b/acct-user/collectd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-user/dehydrated/metadata.xml b/acct-user/dehydrated/metadata.xml
index a442f39eb095..0885e8a081b0 100644
--- a/acct-user/dehydrated/metadata.xml
+++ b/acct-user/dehydrated/metadata.xml
@@ -4,8 +4,4 @@
 	<maintainer type="person">
 		<email>mschiff@g.o</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/acct-user/fcron/metadata.xml b/acct-user/fcron/metadata.xml
index 87336d400336..489e730c1c90 100644
--- a/acct-user/fcron/metadata.xml
+++ b/acct-user/fcron/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>blueness@g.o</email>
 		<name>Anthony G. Basile</name>

diff --git a/acct-user/fritzbox_smarthome_exporter/metadata.xml b/acct-user/fritzbox_smarthome_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/fritzbox_smarthome_exporter/metadata.xml
+++ b/acct-user/fritzbox_smarthome_exporter/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-user/mysqld_exporter/metadata.xml b/acct-user/mysqld_exporter/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/mysqld_exporter/metadata.xml
+++ b/acct-user/mysqld_exporter/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-user/nginx/metadata.xml b/acct-user/nginx/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/nginx/metadata.xml
+++ b/acct-user/nginx/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-user/pipewire/metadata.xml b/acct-user/pipewire/metadata.xml
index 818bc8df5664..6d27fca777f7 100644
--- a/acct-user/pipewire/metadata.xml
+++ b/acct-user/pipewire/metadata.xml
@@ -13,8 +13,4 @@
 		<email>asturm@g.o</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/acct-user/sabnzbd/metadata.xml b/acct-user/sabnzbd/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/acct-user/sabnzbd/metadata.xml
+++ b/acct-user/sabnzbd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/acct-user/unbound/metadata.xml b/acct-user/unbound/metadata.xml
index a3bdd9f74bf4..f63250c09310 100644
--- a/acct-user/unbound/metadata.xml
+++ b/acct-user/unbound/metadata.xml
@@ -5,8 +5,4 @@
 		<email>mschiff@g.o</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-admin/cli53/metadata.xml b/app-admin/cli53/metadata.xml
index 69248b68c261..690d0d4af10c 100644
--- a/app-admin/cli53/metadata.xml
+++ b/app-admin/cli53/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/barnybug/cli53/issues</bugs-to>
 		<remote-id type="github">barnybug/cli53</remote-id>

diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index bc281d24c94e..3040f8d2a2a1 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="clickhouse">Build the ClickHouse output module (requires <pkg>net-misc/curl</pkg>)</flag>
 		<flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag>

diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index b456900e42ab..176236e008c3 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="all_sfx">
 			Install all SFX (Self-Extracting) files rather than just the native

diff --git a/app-arch/unrar/metadata.xml b/app-arch/unrar/metadata.xml
index dab6b92a1d59..29bcd146892a 100644
--- a/app-arch/unrar/metadata.xml
+++ b/app-arch/unrar/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>base-system@g.o</email>
 		<name>Gentoo Base System</name>

diff --git a/app-backup/tarsnap/metadata.xml b/app-backup/tarsnap/metadata.xml
index 674392884e60..e5c4248bc00f 100644
--- a/app-backup/tarsnap/metadata.xml
+++ b/app-backup/tarsnap/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>whissi@g.o</email>
-        <name>Thomas Deutschmann</name>
-    </maintainer>
+    <!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-crypt/dehydrated/metadata.xml b/app-crypt/dehydrated/metadata.xml
index 01e9074304e2..d4974e2fd2d8 100644
--- a/app-crypt/dehydrated/metadata.xml
+++ b/app-crypt/dehydrated/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>mschiff@g.o</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<use>
 		<flag name="cron">Install cron job to sign/renew non-existent/changed/expiring certificates</flag>

diff --git a/app-metrics/collectd/metadata.xml b/app-metrics/collectd/metadata.xml
index fe866f048665..19f8407871b2 100644
--- a/app-metrics/collectd/metadata.xml
+++ b/app-metrics/collectd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Collectd gathers statistics about the system it is running on and stores this
 		information. Those statistics can then be used to find current performance

diff --git a/app-metrics/fritzbox_smarthome_exporter/metadata.xml b/app-metrics/fritzbox_smarthome_exporter/metadata.xml
index 528cc1f6142c..bce410d43d1b 100644
--- a/app-metrics/fritzbox_smarthome_exporter/metadata.xml
+++ b/app-metrics/fritzbox_smarthome_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/jayme-github/fritzbox_smarthome_exporter/issues</bugs-to>
 		<remote-id type="github">jayme-github/fritzbox_smarthome_exporter</remote-id>

diff --git a/app-metrics/mysqld_exporter/metadata.xml b/app-metrics/mysqld_exporter/metadata.xml
index 5e2037794916..3f68a9476d81 100644
--- a/app-metrics/mysqld_exporter/metadata.xml
+++ b/app-metrics/mysqld_exporter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">prometheus/mysqld_exporter</remote-id>
 	</upstream>

diff --git a/app-portage/elicense/metadata.xml b/app-portage/elicense/metadata.xml
index d5e2ae1978ee..a84bb3c8b94d 100644
--- a/app-portage/elicense/metadata.xml
+++ b/app-portage/elicense/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">Whissi/elicense</remote-id>

diff --git a/app-portage/golop/metadata.xml b/app-portage/golop/metadata.xml
index 6fc024cacf56..94f2ca024598 100644
--- a/app-portage/golop/metadata.xml
+++ b/app-portage/golop/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/klausman/golop/issues/</bugs-to>
 		<changelog>https://github.com/klausman/golop/commits/master</changelog>

diff --git a/app-text/vgrep/metadata.xml b/app-text/vgrep/metadata.xml
index 3efa0310a8a1..afe9da646958 100644
--- a/app-text/vgrep/metadata.xml
+++ b/app-text/vgrep/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/vrothberg/vgrep/issues</bugs-to>
 		<remote-id type="github">vrothberg/vgrep</remote-id>

diff --git a/dev-libs/libee/metadata.xml b/dev-libs/libee/metadata.xml
index c420a82a567a..85e4ed814fa2 100644
--- a/dev-libs/libee/metadata.xml
+++ b/dev-libs/libee/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>whissi@g.o</email>
-	<name>Thomas Deutschmann</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index ca8f6f06bde4..4a9243df5882 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/rsyslog/libestr/issues</bugs-to>
 		<remote-id type="github">rsyslog/libestr</remote-id>

diff --git a/dev-libs/libfastjson/metadata.xml b/dev-libs/libfastjson/metadata.xml
index 09a879535239..5cd060458eea 100644
--- a/dev-libs/libfastjson/metadata.xml
+++ b/dev-libs/libfastjson/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<slots>
 		<subslots>Reflect ABI of libfastjson.so.</subslots>
 	</slots>

diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 500b9c96278a..8dd79362d8cb 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -5,10 +5,6 @@
 		<email>ultrabug@g.o</email>
 		<name>Ultrabug</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<use>
 		<flag name="rfc3195">
 			Enables RFC 3195 protocol (aka syslog-reliable) support.

diff --git a/dev-libs/liblognorm/metadata.xml b/dev-libs/liblognorm/metadata.xml
index 1332094b770c..0a2e9060adfe 100644
--- a/dev-libs/liblognorm/metadata.xml
+++ b/dev-libs/liblognorm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<slots>
 		<subslots>Reflect ABI of liblognorm.so.</subslots>
 	</slots>

diff --git a/dev-libs/librdkafka/metadata.xml b/dev-libs/librdkafka/metadata.xml
index 179d5698aff0..147ef55459fa 100644
--- a/dev-libs/librdkafka/metadata.xml
+++ b/dev-libs/librdkafka/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/edenhill/librdkafka/issues</bugs-to>
 		<remote-id type="github">edenhill/librdkafka</remote-id>

diff --git a/dev-libs/librelp/metadata.xml b/dev-libs/librelp/metadata.xml
index ad309c9b6260..f0df933ee186 100644
--- a/dev-libs/librelp/metadata.xml
+++ b/dev-libs/librelp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gnutls">Use GnuTLS</flag>
 		<flag name="openssl">Use OpenSSL</flag>

diff --git a/dev-libs/libxmlb/metadata.xml b/dev-libs/libxmlb/metadata.xml
index b7c01e26d68b..9b6f17afbec2 100644
--- a/dev-libs/libxmlb/metadata.xml
+++ b/dev-libs/libxmlb/metadata.xml
@@ -5,10 +5,6 @@
     <email>polynomial-c@g.o</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>whissi@g.o</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
   <use>
     <flag name="stemmer">Enable language stemming support</flag>
   </use>

diff --git a/dev-php/realpath_turbo/metadata.xml b/dev-php/realpath_turbo/metadata.xml
index cca5e7c9e34f..f689049a20f7 100644
--- a/dev-php/realpath_turbo/metadata.xml
+++ b/dev-php/realpath_turbo/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>php-bugs@g.o</email>
 		<name>PHP Project</name>

diff --git a/dev-python/PyRSS2Gen/metadata.xml b/dev-python/PyRSS2Gen/metadata.xml
index f1de17f81938..b612a87851b5 100644
--- a/dev-python/PyRSS2Gen/metadata.xml
+++ b/dev-python/PyRSS2Gen/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">PyRSS2Gen</remote-id>

diff --git a/dev-python/fritzconnection/metadata.xml b/dev-python/fritzconnection/metadata.xml
index 81183c29acc9..80aadfcb4881 100644
--- a/dev-python/fritzconnection/metadata.xml
+++ b/dev-python/fritzconnection/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@g.o</email>
 		<name>Python</name>

diff --git a/dev-python/puremagic/metadata.xml b/dev-python/puremagic/metadata.xml
index 429ae6eb00a4..39cdeff15460 100644
--- a/dev-python/puremagic/metadata.xml
+++ b/dev-python/puremagic/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@g.o</email>
 		<name>Python</name>

diff --git a/dev-python/pymilter/metadata.xml b/dev-python/pymilter/metadata.xml
index 378ef7571179..545e49370381 100644
--- a/dev-python/pymilter/metadata.xml
+++ b/dev-python/pymilter/metadata.xml
@@ -5,10 +5,6 @@
 		<email>gentoo@××××××××.de</email>
 		<name>Ralph Seichter</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<longdescription>
 		A python extension module to enable python scripts to attach
 		to sendmail’s libmilter functionality. Additional python

diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index 66eb1b098165..5a4c5ffdd2df 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@g.o</email>
 		<name>Python</name>

diff --git a/dev-python/sabyenc/metadata.xml b/dev-python/sabyenc/metadata.xml
index c8de1e3a2d14..ff36593f0fed 100644
--- a/dev-python/sabyenc/metadata.xml
+++ b/dev-python/sabyenc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">sabyenc</remote-id>
 	</upstream>

diff --git a/dev-python/ws4py/metadata.xml b/dev-python/ws4py/metadata.xml
index c304c231f167..bcbb23469491 100644
--- a/dev-python/ws4py/metadata.xml
+++ b/dev-python/ws4py/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="client">Install client modules</flag>
 		<flag name="server">Install server modules</flag>

diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml
index f88730b7d3ba..b7e4f57f5480 100644
--- a/media-video/pipewire/metadata.xml
+++ b/media-video/pipewire/metadata.xml
@@ -13,10 +13,6 @@
 		<email>asturm@g.o</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://gitlab.freedesktop.org/pipewire/pipewire/-/issues</bugs-to>
 		<changelog>https://gitlab.freedesktop.org/pipewire/pipewire/-/releases</changelog>

diff --git a/net-dns/dnssec-root/metadata.xml b/net-dns/dnssec-root/metadata.xml
index a3bdd9f74bf4..f63250c09310 100644
--- a/net-dns/dnssec-root/metadata.xml
+++ b/net-dns/dnssec-root/metadata.xml
@@ -5,8 +5,4 @@
 		<email>mschiff@g.o</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-dns/dnsviz/metadata.xml b/net-dns/dnsviz/metadata.xml
index 30ed7d3b0c25..dd590e429417 100644
--- a/net-dns/dnsviz/metadata.xml
+++ b/net-dns/dnsviz/metadata.xml
@@ -5,10 +5,6 @@
 		<email>hasan.calisir@×××××××.com</email>
 		<name>Hasan ÇALIŞIR</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@g.o</email>
 		<name>Proxy Maintainers</name>

diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 4b78f252682f..86c41bca787c 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -5,10 +5,6 @@
     <email>mschiff@g.o</email>
     <name>Marc Schiffbauer</name>
   </maintainer>
-  <maintainer type="person">
-    <email>whissi@g.o</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
   <longdescription lang="en">
   Unbound is a validating, recursive, and caching DNS resolver.
 

diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index bfc572c0d1bf..6e9634122307 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@g.o</email>
 		<name>Gentoo network monitoring and analysis project</name>

diff --git a/net-irc/znc-clientbuffer/metadata.xml b/net-irc/znc-clientbuffer/metadata.xml
index dc9ec3da65d1..51ac8d02eab7 100644
--- a/net-irc/znc-clientbuffer/metadata.xml
+++ b/net-irc/znc-clientbuffer/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://git.jordanko.ch/Igloo/Push/issues</bugs-to>
 		<remote-id type="github">CyberShadow/znc-clientbuffer</remote-id>

diff --git a/net-irc/znc-igloo-push/metadata.xml b/net-irc/znc-igloo-push/metadata.xml
index e3a8e4ccc210..43814c921ee8 100644
--- a/net-irc/znc-igloo-push/metadata.xml
+++ b/net-irc/znc-igloo-push/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A ZNC module which provides push notifications through ZNC
 		for the iOS Igloo App while being disconnected from IRC.

diff --git a/net-irc/znc-playback/metadata.xml b/net-irc/znc-playback/metadata.xml
index 9fc649a0f142..97e82cb046d9 100644
--- a/net-irc/znc-playback/metadata.xml
+++ b/net-irc/znc-playback/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		The advanced playback module for ZNC makes it possible for IRC clients
 		to avoid undesired repetitive buffer playback. IRC clients may request

diff --git a/net-libs/liboping/metadata.xml b/net-libs/liboping/metadata.xml
index 2a895499c86d..304b1e0f0f33 100644
--- a/net-libs/liboping/metadata.xml
+++ b/net-libs/liboping/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<slots>
 		<subslots>Reflect major ABI version (=upstream's LIBOPING_CURRENT value) of liboping.so.</subslots>
 	</slots>

diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 1f419dc1559d..06a50dbf3eed 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer>
 			<email>sustrik@××××××.com</email>

diff --git a/net-misc/httpstat/metadata.xml b/net-misc/httpstat/metadata.xml
index 556bbae45e50..be402a6b8eb8 100644
--- a/net-misc/httpstat/metadata.xml
+++ b/net-misc/httpstat/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/reorx/httpstat/issues</bugs-to>

diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml
index c80a28a838a0..51985353b6f9 100644
--- a/net-nntp/sabnzbd/metadata.xml
+++ b/net-nntp/sabnzbd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="7za">Add support for extracting 7za files</flag>
 		<flag name="rar">Add support for extracting rar files</flag>

diff --git a/sec-keys/openpgp-keys-unbound/metadata.xml b/sec-keys/openpgp-keys-unbound/metadata.xml
index 2fa1c07cb01d..a0e7d9289325 100644
--- a/sec-keys/openpgp-keys-unbound/metadata.xml
+++ b/sec-keys/openpgp-keys-unbound/metadata.xml
@@ -5,9 +5,5 @@
 		<email>mschiff@g.o</email>
 		<name>Marc Schiffbauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>

diff --git a/sys-apps/fwupd-efi/metadata.xml b/sys-apps/fwupd-efi/metadata.xml
index e5cc4fab9f9f..e2c3ebd672e1 100644
--- a/sys-apps/fwupd-efi/metadata.xml
+++ b/sys-apps/fwupd-efi/metadata.xml
@@ -5,10 +5,6 @@
 		<email>polynomial-c@g.o</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/fwupd/fwupd-efi/issues</bugs-to>
 		<remote-id type="github">fwupd/fwupd-efi</remote-id>

diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index 5ad610d49abe..d9b710232728 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -5,10 +5,6 @@
 		<email>polynomial-c@g.o</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<use>
 		<flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
 		<flag name="amt">Build and install Intel AMT plugin</flag>

diff --git a/sys-apps/hponcfg/metadata.xml b/sys-apps/hponcfg/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-apps/hponcfg/metadata.xml
+++ b/sys-apps/hponcfg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-apps/lm-sensors/metadata.xml b/sys-apps/lm-sensors/metadata.xml
index 581e9a94e242..830697c2b818 100644
--- a/sys-apps/lm-sensors/metadata.xml
+++ b/sys-apps/lm-sensors/metadata.xml
@@ -5,10 +5,6 @@
 		<email>polynomial-c@g.o</email>
 		<name>Lars Wendler</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<slots>
 		<subslots>Reflect ABI of libsensors.so.</subslots>
 	</slots>

diff --git a/sys-block/f3/metadata.xml b/sys-block/f3/metadata.xml
index a0dc08db0218..6175c2165aed 100644
--- a/sys-block/f3/metadata.xml
+++ b/sys-block/f3/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		F3 - an alternative to h2testw
 

diff --git a/sys-block/hpacucli/metadata.xml b/sys-block/hpacucli/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-block/hpacucli/metadata.xml
+++ b/sys-block/hpacucli/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-block/hpssacli/metadata.xml b/sys-block/hpssacli/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-block/hpssacli/metadata.xml
+++ b/sys-block/hpssacli/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-block/storcli/metadata.xml b/sys-block/storcli/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-block/storcli/metadata.xml
+++ b/sys-block/storcli/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-fs/ncdu/metadata.xml b/sys-fs/ncdu/metadata.xml
index ece644aaab86..6dc93538c117 100644
--- a/sys-fs/ncdu/metadata.xml
+++ b/sys-fs/ncdu/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		As the name already suggests, ncdu is an NCurses version of the famous old 'du'
 		unix command. It provides a fast and easy interface to your harddrive. Where is

diff --git a/sys-libs/libfaketime/metadata.xml b/sys-libs/libfaketime/metadata.xml
index 8837fc4586b8..2f33dab322e2 100644
--- a/sys-libs/libfaketime/metadata.xml
+++ b/sys-libs/libfaketime/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		The Fake Time Preload Library (FTPL, a.k.a. libfaketime) intercepts
 		various system calls which programs use to retrieve the current date and time.

diff --git a/sys-libs/libsmbios/metadata.xml b/sys-libs/libsmbios/metadata.xml
index ce37030a7d8c..9c2725b929bf 100644
--- a/sys-libs/libsmbios/metadata.xml
+++ b/sys-libs/libsmbios/metadata.xml
@@ -5,10 +5,6 @@
     <email>polynomial-c@g.o</email>
     <name>Lars Wendler</name>
   </maintainer>
-  <maintainer type="person">
-    <email>whissi@g.o</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
   <longdescription>The libsmbios project aims towards providing access to as much
 BIOS information as possible. It does this by providing a library of functions
 that can be used as well as sample binaries.</longdescription>

diff --git a/sys-process/fcron/metadata.xml b/sys-process/fcron/metadata.xml
index 9ad46bdf7db7..025c721b00d2 100644
--- a/sys-process/fcron/metadata.xml
+++ b/sys-process/fcron/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>blueness@g.o</email>
 		<name>Anthony G. Basile</name>

diff --git a/sys-process/incron/metadata.xml b/sys-process/incron/metadata.xml
index 542a8a19f0f6..115e9d64a669 100644
--- a/sys-process/incron/metadata.xml
+++ b/sys-process/incron/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/www-apache/mod_maxminddb/metadata.xml b/www-apache/mod_maxminddb/metadata.xml
index bc0c7c700b38..7e3aec64fef6 100644
--- a/www-apache/mod_maxminddb/metadata.xml
+++ b/www-apache/mod_maxminddb/metadata.xml
@@ -5,10 +5,6 @@
 		<email>hydrapolic@×××××.com</email>
 		<name>Tomáš Mózes</name>
 	</maintainer>
-	<maintainer type="person" proxied="proxy">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">maxmind/mod_maxminddb</remote-id>
 	</upstream>

diff --git a/www-apps/nextcloud-notify_push/metadata.xml b/www-apps/nextcloud-notify_push/metadata.xml
index d7c52629e770..319118400a40 100644
--- a/www-apps/nextcloud-notify_push/metadata.xml
+++ b/www-apps/nextcloud-notify_push/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>whissi@g.o</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/nextcloud/notify_push/issues</bugs-to>
 		<remote-id type="github">nextcloud/notify_push</remote-id>

diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index db71581d0733..3af3c50e7b1c 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@g.o</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="assets">
       Support web asset management

diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index df25d37883dd..af08e0a80963 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@g.o</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="aio">Enables file AIO support</flag>
     <flag name="http">Enable HTTP core support</flag>