[gentoo-commits] repo/gentoo:master commit in: app-admin/tmpreaper/, media-libs/icc-profiles-basiccolor-printing2009/, ...

[Michał Górny]

commit:     8f93b7cfbf4aec8c9238e250cd7d51115e3d6831
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 10:01:27 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 10:11:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f93b7cf

*/*: reassign packages for xmw <AT> g.o

Bug: https://bugs.gentoo.org/319525
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/bcfg2/metadata.xml                                 | 5 +----
 app-admin/conkyforecast/metadata.xml                         | 5 +----
 app-admin/elektra/metadata.xml                               | 5 +----
 app-admin/gtkdiskfree/metadata.xml                           | 4 ----
 app-admin/makepasswd/metadata.xml                            | 5 +----
 app-admin/tmpreaper/metadata.xml                             | 5 +----
 app-arch/advancecomp/metadata.xml                            | 7 ++-----
 app-backup/backintime/metadata.xml                           | 5 +----
 app-backup/tsm/metadata.xml                                  | 4 ----
 app-benchmarks/gtkperf/metadata.xml                          | 4 +---
 app-crypt/codegroup/metadata.xml                             | 5 +----
 app-editors/jupp/metadata.xml                                | 5 +----
 app-emulation/simh/metadata.xml                              | 5 +----
 app-eselect/eselect-opencascade/metadata.xml                 | 5 +----
 app-laptop/thinkfan/metadata.xml                             | 5 +----
 app-misc/abduco/metadata.xml                                 | 4 ----
 app-misc/cbrpager/metadata.xml                               | 5 +----
 app-misc/freeplane/metadata.xml                              | 7 ++-----
 app-misc/golly/metadata.xml                                  | 5 +----
 app-misc/gtk-sunlight/metadata.xml                           | 5 +----
 app-misc/hddled/metadata.xml                                 | 5 +----
 app-misc/hexcompare/metadata.xml                             | 5 +----
 app-misc/lcdproc/metadata.xml                                | 4 ----
 app-misc/logserial/metadata.xml                              | 5 +----
 app-misc/pystopwatch/metadata.xml                            | 5 +----
 app-misc/qlcplus/metadata.xml                                | 7 ++-----
 app-misc/toilet/metadata.xml                                 | 5 +----
 app-misc/wipe/metadata.xml                                   | 5 +----
 app-portage/eix/metadata.xml                                 | 4 ----
 app-portage/porticron/metadata.xml                           | 5 +----
 app-shells/autojump/metadata.xml                             | 5 +----
 app-shells/push/metadata.xml                                 | 4 ----
 app-shells/quoter/metadata.xml                               | 4 ----
 app-text/llpp/metadata.xml                                   | 5 +----
 app-text/mupdf/metadata.xml                                  | 4 ----
 app-text/paps/metadata.xml                                   | 5 +----
 app-text/pdfshuffler/metadata.xml                            | 5 +----
 app-text/xmldiff/metadata.xml                                | 5 +----
 app-text/zathura-cb/metadata.xml                             | 5 +----
 app-text/zathura-djvu/metadata.xml                           | 5 +----
 app-text/zathura-meta/metadata.xml                           | 5 +----
 app-text/zathura-pdf-mupdf/metadata.xml                      | 5 +----
 app-text/zathura-pdf-poppler/metadata.xml                    | 5 +----
 app-text/zathura-ps/metadata.xml                             | 5 +----
 app-text/zathura/metadata.xml                                | 5 +----
 dev-db/datadraw/metadata.xml                                 | 4 ----
 dev-db/sqlitebrowser/metadata.xml                            | 5 +----
 dev-libs/girara/metadata.xml                                 | 5 +----
 dev-libs/libcli/metadata.xml                                 | 5 +----
 dev-libs/libcss/metadata.xml                                 | 4 ----
 dev-libs/libcxml/metadata.xml                                | 5 +----
 dev-libs/libmodbus/metadata.xml                              | 5 +----
 dev-libs/libnsfb/metadata.xml                                | 4 ----
 dev-libs/libnsutils/metadata.xml                             | 4 ----
 dev-libs/libparserutils/metadata.xml                         | 4 ----
 dev-libs/libutf8proc/metadata.xml                            | 4 ----
 dev-libs/libwapcaplet/metadata.xml                           | 4 ----
 dev-libs/locked_sstream/metadata.xml                         | 5 +----
 dev-libs/nsgenbind/metadata.xml                              | 4 ----
 dev-libs/rote/metadata.xml                                   | 5 +----
 dev-libs/skalibs/metadata.xml                                | 4 ----
 dev-libs/yajl/metadata.xml                                   | 4 ----
 dev-perl/Getopt-GUI-Long/metadata.xml                        | 4 ----
 dev-python/netifaces/metadata.xml                            | 6 +-----
 dev-python/pyClamd/metadata.xml                              | 5 +----
 dev-python/pycollada/metadata.xml                            | 5 +----
 dev-python/pyldap/metadata.xml                               | 5 -----
 dev-python/pyopengl_accelerate/metadata.xml                  | 7 ++-----
 dev-python/python-ldap/metadata.xml                          | 4 ----
 dev-python/python-linux-procfs/metadata.xml                  | 5 +----
 dev-python/rencode/metadata.xml                              | 5 +----
 dev-python/thunarx-python/metadata.xml                       | 6 +-----
 dev-util/apitrace/metadata.xml                               | 5 +----
 dev-util/biew/metadata.xml                                   | 5 +----
 dev-util/cppcheck/metadata.xml                               | 5 +----
 dev-util/fatrace/metadata.xml                                | 5 +----
 dev-util/makeheaders/metadata.xml                            | 5 +----
 dev-util/pycharm-community/metadata.xml                      | 5 +----
 dev-util/pycharm-professional/metadata.xml                   | 5 +----
 dev-util/waf/metadata.xml                                    | 5 +----
 dev-vcs/rabbitvcs/metadata.xml                               | 5 +----
 games-misc/lucidlife/metadata.xml                            | 4 ----
 games-simulation/crrcsim/metadata.xml                        | 4 ----
 gnustep-apps/sogo/metadata.xml                               | 4 ----
 gnustep-libs/sope/metadata.xml                               | 4 ----
 media-fonts/termsyn/metadata.xml                             | 5 +----
 media-gfx/fim/metadata.xml                                   | 4 ----
 media-gfx/icc_examin/metadata.xml                            | 5 +----
 media-gfx/openscad/metadata.xml                              | 5 +----
 media-gfx/recoverjpeg/metadata.xml                           | 5 +----
 media-gfx/zbar/metadata.xml                                  | 5 +----
 media-libs/icc-profiles-basiccolor-printing2009/metadata.xml | 5 +----
 media-libs/icc-profiles-openicc/metadata.xml                 | 5 +----
 media-libs/libXcm/metadata.xml                               | 7 ++-----
 media-libs/libasdcp-cth/metadata.xml                         | 5 +----
 media-libs/libbmp/metadata.xml                               | 5 +----
 media-libs/libdcp/metadata.xml                               | 5 +----
 media-libs/libnsbmp/metadata.xml                             | 4 ----
 media-libs/libnsgif/metadata.xml                             | 4 ----
 media-libs/libnspsl/metadata.xml                             | 4 ----
 media-libs/librosprite/metadata.xml                          | 4 ----
 media-libs/libsub/metadata.xml                               | 5 +----
 media-libs/libsvgtiny/metadata.xml                           | 4 ----
 media-libs/oyranos/metadata.xml                              | 5 +----
 media-libs/raspberrypi-userland-bin/metadata.xml             | 7 ++-----
 media-radio/KochMorse/metadata.xml                           | 5 +----
 media-sound/baudline/metadata.xml                            | 5 +----
 media-sound/spek/metadata.xml                                | 5 +----
 media-video/dcpomatic/metadata.xml                           | 5 +----
 net-analyzer/bing/metadata.xml                               | 5 +----
 net-analyzer/dietsniff/metadata.xml                          | 5 +----
 net-analyzer/netsniff-ng/metadata.xml                        | 5 +----
 net-analyzer/tcping/metadata.xml                             | 5 +----
 net-analyzer/thc-ipv6/metadata.xml                           | 5 +----
 net-dns/dnssec-check/metadata.xml                            | 5 +----
 net-dns/dnssec-root/metadata.xml                             | 5 +----
 net-dns/dnssec-tools/metadata.xml                            | 5 +----
 net-dns/dnssec-validator/metadata.xml                        | 5 +----
 net-dns/dnstop/metadata.xml                                  | 4 ----
 net-dns/totd/metadata.xml                                    | 5 +----
 net-ftp/oftpd/metadata.xml                                   | 5 +----
 net-libs/enet/metadata.xml                                   | 5 +----
 net-libs/libdom/metadata.xml                                 | 4 ----
 net-libs/libhubbub/metadata.xml                              | 4 ----
 net-libs/nacl/metadata.xml                                   | 5 +----
 net-mail/fdm/metadata.xml                                    | 5 +----
 net-misc/aget/metadata.xml                                   | 5 +----
 net-misc/arpd/metadata.xml                                   | 5 +----
 net-misc/balance/metadata.xml                                | 5 +----
 net-misc/batctl/metadata.xml                                 | 5 +----
 net-misc/batman-adv/metadata.xml                             | 5 +----
 net-misc/gofish/metadata.xml                                 | 5 +----
 net-misc/hotot/metadata.xml                                  | 5 +----
 net-misc/knock/metadata.xml                                  | 5 +----
 net-misc/minidlna/metadata.xml                               | 5 +----
 net-misc/mosh/metadata.xml                                   | 4 ----
 net-misc/ncp/metadata.xml                                    | 5 +----
 net-misc/ndisc6/metadata.xml                                 | 5 +----
 net-misc/netkit-bootparamd/metadata.xml                      | 5 +----
 net-misc/netkit-bootpd/metadata.xml                          | 5 +----
 net-misc/radvd/metadata.xml                                  | 4 ----
 net-misc/rancid-git/metadata.xml                             | 5 +----
 net-misc/rancid/metadata.xml                                 | 5 +----
 net-misc/secpanel/metadata.xml                               | 5 +----
 net-nds/ldapvi/metadata.xml                                  | 5 +----
 net-p2p/ncdc/metadata.xml                                    | 5 +----
 net-p2p/transmission-remote-cli/metadata.xml                 | 4 ----
 net-proxy/tayga/metadata.xml                                 | 5 +----
 net-vpn/aiccu/metadata.xml                                   | 5 +----
 net-vpn/isatapd/metadata.xml                                 | 5 +----
 net-wireless/dump1090/metadata.xml                           | 4 ----
 net-wireless/horst/metadata.xml                              | 7 ++-----
 sci-electronics/netgen/metadata.xml                          | 4 ----
 sci-electronics/osqoop/metadata.xml                          | 5 +----
 sci-electronics/xoscope/metadata.xml                         | 4 ----
 sci-geosciences/gpxpy/metadata.xml                           | 5 +----
 sci-libs/opencascade/metadata.xml                            | 5 +----
 sci-misc/mendeleydesktop/metadata.xml                        | 4 ----
 sys-auth/fingerprint-gui/metadata.xml                        | 5 +----
 sys-auth/fprint_demo/metadata.xml                            | 5 +----
 sys-auth/fprintd/metadata.xml                                | 5 +----
 sys-auth/libfprint/metadata.xml                              | 4 ----
 sys-auth/libnss-cache/metadata.xml                           | 5 +----
 sys-auth/pam_fprint/metadata.xml                             | 5 +----
 sys-auth/thinkfinger/metadata.xml                            | 5 +----
 sys-boot/raspberrypi-firmware/metadata.xml                   | 5 +----
 sys-boot/raspberrypi-mkimage/metadata.xml                    | 5 +----
 sys-fs/ncdu/metadata.xml                                     | 6 +-----
 sys-kernel/raspberrypi-image/metadata.xml                    | 5 +----
 sys-kernel/raspberrypi-sources/metadata.xml                  | 5 +----
 sys-power/phc-intel/metadata.xml                             | 5 +----
 sys-power/suspend/metadata.xml                               | 4 ----
 www-apps/blazeblogger/metadata.xml                           | 5 +----
 www-client/netsurf/metadata.xml                              | 4 ----
 www-plugins/mozplugger/metadata.xml                          | 5 +----
 x11-libs/gtkdatabox/metadata.xml                             | 4 ----
 x11-misc/simpleswitcher/metadata.xml                         | 5 +----
 x11-misc/trayer-srg/metadata.xml                             | 5 +----
 x11-misc/wmname/metadata.xml                                 | 5 +----
 x11-misc/xwinwrap/metadata.xml                               | 5 +----
 x11-plugins/pidgin-led-notification/metadata.xml             | 5 +----
 x11-plugins/pidgin-privacy-please/metadata.xml               | 5 +----
 x11-terms/st/metadata.xml                                    | 4 ----
 x11-wm/cwm/metadata.xml                                      | 5 +----
 x11-wm/sithwm/metadata.xml                                   | 5 +----
 x11-wm/spectrwm/metadata.xml                                 | 5 +----
 x11-wm/xpra/metadata.xml                                     | 5 +----
 187 files changed, 148 insertions(+), 758 deletions(-)

diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
index f46d2d0d99a..882636d976e 100644
--- a/app-admin/bcfg2/metadata.xml
+++ b/app-admin/bcfg2/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="cheetah">Include dev-python/cheetah support</flag>
 	<flag name="genshi">Include dev-python/genshi support</flag>

diff --git a/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
index d9f08c9f241..3d71692a6bb 100644
--- a/app-admin/conkyforecast/metadata.xml
+++ b/app-admin/conkyforecast/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="launchpad">~conky-companions</remote-id>
 	</upstream>

diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index 0cc6943fa1f..6f5f3e3ebc0 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="augeas">Enable plugin for reading and writing configuration files with help from Augeas</flag>
 		<flag name="ini">Enable new, advanced ini support</flag>

diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index bae1c66e044..88053de1aae 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -5,10 +5,6 @@
 		<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@××××××××××.ch</email>
 		<name>Samuel Bauer</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@g.o</email>
 		<name>Proxy Maintainers</name>

diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
index 00668f1a86d..0d035ad2e64 100644
--- a/app-admin/makepasswd/metadata.xml
+++ b/app-admin/makepasswd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		A random password generator, for all your secure password needs.
 	</longdescription>

diff --git a/app-admin/tmpreaper/metadata.xml b/app-admin/tmpreaper/metadata.xml
index 6f3fd9e0f55..81b1ae5cf42 100644
--- a/app-admin/tmpreaper/metadata.xml
+++ b/app-admin/tmpreaper/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		tmpreaper is a program that can be used to clean out temporary-file
 		directories. It recursively searches the directory, refusing to chdir()

diff --git a/app-arch/advancecomp/metadata.xml b/app-arch/advancecomp/metadata.xml
index df2737613e8..644ac1ca3c5 100644
--- a/app-arch/advancecomp/metadata.xml
+++ b/app-arch/advancecomp/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		AdvanceCOMP is a set of recompression utilities for .PNG, .MNG, .ZIP
 		and .GZ files

diff --git a/app-backup/backintime/metadata.xml b/app-backup/backintime/metadata.xml
index 1e5022f0fbc..6bbfe72c81c 100644
--- a/app-backup/backintime/metadata.xml
+++ b/app-backup/backintime/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Back In Time is a simple backup tool for Linux inspired from "flyback project" and "TimeVault". The backup is done by taking snapshots of a specified set of directories.
 		Currently there are two GUI available: Gnome and KDE 4 (&gt;= 4.1).

diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml
index 1bc67e1a1dd..5c23451875c 100644
--- a/app-backup/tsm/metadata.xml
+++ b/app-backup/tsm/metadata.xml
@@ -4,10 +4,6 @@
 	<maintainer type="person">
 		<email>dilfridge@g.o</email>
 	</maintainer>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<use>
 		<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>
 		<flag name="tsm_hw">Difference snapshot support for NetApp and N-Series file servers</flag>

diff --git a/app-benchmarks/gtkperf/metadata.xml b/app-benchmarks/gtkperf/metadata.xml
index 101920d3572..2cb207510b0 100644
--- a/app-benchmarks/gtkperf/metadata.xml
+++ b/app-benchmarks/gtkperf/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 	GtkPerf is an application designed to test GTK+ performance. The point
 	is to create common testing platform to run predefined GTK+ widgets

diff --git a/app-crypt/codegroup/metadata.xml b/app-crypt/codegroup/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/app-crypt/codegroup/metadata.xml
+++ b/app-crypt/codegroup/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-editors/jupp/metadata.xml b/app-editors/jupp/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/app-editors/jupp/metadata.xml
+++ b/app-editors/jupp/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-emulation/simh/metadata.xml b/app-emulation/simh/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/app-emulation/simh/metadata.xml
+++ b/app-emulation/simh/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-eselect/eselect-opencascade/metadata.xml b/app-eselect/eselect-opencascade/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/app-eselect/eselect-opencascade/metadata.xml
+++ b/app-eselect/eselect-opencascade/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-laptop/thinkfan/metadata.xml b/app-laptop/thinkfan/metadata.xml
index 79dc72426bd..45016f6358c 100644
--- a/app-laptop/thinkfan/metadata.xml
+++ b/app-laptop/thinkfan/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="atasmart">include libatasmart support to get disc temperature</flag>
 	</use>

diff --git a/app-misc/abduco/metadata.xml b/app-misc/abduco/metadata.xml
index b5007ff63a3..ae7d6197d81 100644
--- a/app-misc/abduco/metadata.xml
+++ b/app-misc/abduco/metadata.xml
@@ -5,10 +5,6 @@
 	<email>hendrik@××××××××××.de</email>
 	<name>Hendrik v. Raven (lorem_ipsum)</name>
 </maintainer>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
 <maintainer type="project">
 	<email>proxy-maint@g.o</email>
 	<name>Proxy Maintainers</name>

diff --git a/app-misc/cbrpager/metadata.xml b/app-misc/cbrpager/metadata.xml
index bcf8ff6b072..ab75470f3ea 100644
--- a/app-misc/cbrpager/metadata.xml
+++ b/app-misc/cbrpager/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">cbrpager</remote-id>
 	</upstream>

diff --git a/app-misc/freeplane/metadata.xml b/app-misc/freeplane/metadata.xml
index 14c857935b2..fb07d0fa750 100644
--- a/app-misc/freeplane/metadata.xml
+++ b/app-misc/freeplane/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 Freeplane is a free and open source software application that supports thinking, sharing information and getting things done at work, in school and at home. The software can be used for mind mapping and analyzing the information contained in mind maps.
 	</longdescription>

diff --git a/app-misc/golly/metadata.xml b/app-misc/golly/metadata.xml
index f40f0dd4325..c06a9f3be99 100644
--- a/app-misc/golly/metadata.xml
+++ b/app-misc/golly/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">golly</remote-id>
 	</upstream>

diff --git a/app-misc/gtk-sunlight/metadata.xml b/app-misc/gtk-sunlight/metadata.xml
index d04de4894ed..6f49eba8f49 100644
--- a/app-misc/gtk-sunlight/metadata.xml
+++ b/app-misc/gtk-sunlight/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-misc/hddled/metadata.xml b/app-misc/hddled/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/app-misc/hddled/metadata.xml
+++ b/app-misc/hddled/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-misc/hexcompare/metadata.xml b/app-misc/hexcompare/metadata.xml
index fc00942f639..38b6347b943 100644
--- a/app-misc/hexcompare/metadata.xml
+++ b/app-misc/hexcompare/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">hexcompare</remote-id>
 	</upstream>

diff --git a/app-misc/lcdproc/metadata.xml b/app-misc/lcdproc/metadata.xml
index ab8591e847e..f54e361fd68 100644
--- a/app-misc/lcdproc/metadata.xml
+++ b/app-misc/lcdproc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>ck+gentoo@××××××××.de</email>
 		<name>Conrad Kostecki</name>

diff --git a/app-misc/logserial/metadata.xml b/app-misc/logserial/metadata.xml
index 46956d7db72..b179f1fc8fa 100644
--- a/app-misc/logserial/metadata.xml
+++ b/app-misc/logserial/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Package for loging incoming bytes on asynchronous serial ports. It was
 		written for loging calls on our telephone central, but you can use it

diff --git a/app-misc/pystopwatch/metadata.xml b/app-misc/pystopwatch/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/app-misc/pystopwatch/metadata.xml
+++ b/app-misc/pystopwatch/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-misc/qlcplus/metadata.xml b/app-misc/qlcplus/metadata.xml
index 66cfad42c5f..cba9309e753 100644
--- a/app-misc/qlcplus/metadata.xml
+++ b/app-misc/qlcplus/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">mcallegari/qlcplus</remote-id>
 	</upstream>

diff --git a/app-misc/toilet/metadata.xml b/app-misc/toilet/metadata.xml
index 57798f07851..1b2becffa26 100644
--- a/app-misc/toilet/metadata.xml
+++ b/app-misc/toilet/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-misc/wipe/metadata.xml b/app-misc/wipe/metadata.xml
index 8e517081e10..7d2a171e5ca 100644
--- a/app-misc/wipe/metadata.xml
+++ b/app-misc/wipe/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">wipe</remote-id>
 	</upstream>

diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 2e3b3c4f5b0..4f21451592f 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-</maintainer>
-<maintainer type="person">
     <email>zlogene@g.o</email>
     <name>Mikle Kolyada</name>
   </maintainer>

diff --git a/app-portage/porticron/metadata.xml b/app-portage/porticron/metadata.xml
index ffc8ad5b4f6..e49009053e1 100644
--- a/app-portage/porticron/metadata.xml
+++ b/app-portage/porticron/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">gentoo/porticron</remote-id>
   </upstream>

diff --git a/app-shells/autojump/metadata.xml b/app-shells/autojump/metadata.xml
index b8e575f5b4d..3b1385d4d40 100644
--- a/app-shells/autojump/metadata.xml
+++ b/app-shells/autojump/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <bugs-to>https://github.com/joelthelion/autojump/issues</bugs-to>
     <remote-id type="github">joelthelion/autojump</remote-id>

diff --git a/app-shells/push/metadata.xml b/app-shells/push/metadata.xml
index cc23092c85c..ca3d7eac58f 100644
--- a/app-shells/push/metadata.xml
+++ b/app-shells/push/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="person">
     <email>martin@×××××.de</email>
     <name>Martin Väth</name>

diff --git a/app-shells/quoter/metadata.xml b/app-shells/quoter/metadata.xml
index 53182033250..12d4fad2e53 100644
--- a/app-shells/quoter/metadata.xml
+++ b/app-shells/quoter/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="person">
     <email>martin@×××××.de</email>
     <name>Martin Väth</name>

diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/app-text/llpp/metadata.xml
+++ b/app-text/llpp/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 38351433e8b..5866930fdf0 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/app-text/paps/metadata.xml b/app-text/paps/metadata.xml
index 3258972788e..54bd128e976 100644
--- a/app-text/paps/metadata.xml
+++ b/app-text/paps/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">paps</remote-id>
 	</upstream>

diff --git a/app-text/pdfshuffler/metadata.xml b/app-text/pdfshuffler/metadata.xml
index 1449934ed1e..bab57cb5346 100644
--- a/app-text/pdfshuffler/metadata.xml
+++ b/app-text/pdfshuffler/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="sourceforge">pdfshuffler</remote-id>
 </upstream>

diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index 30d3057f57c..14c1b6f3de8 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A python tool that figures out the differences between two
 		similar XML files, in the same way the diff utility does.

diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index b7ed6eb4ffb..8aafd7f242b 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>mlq@××××.org</email>

diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
index b7ed6eb4ffb..8aafd7f242b 100644
--- a/app-text/zathura-djvu/metadata.xml
+++ b/app-text/zathura-djvu/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>mlq@××××.org</email>

diff --git a/app-text/zathura-meta/metadata.xml b/app-text/zathura-meta/metadata.xml
index 2482ebc42ae..c80ab57c7e6 100644
--- a/app-text/zathura-meta/metadata.xml
+++ b/app-text/zathura-meta/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="cb">Install plug-in for ComicBook support</flag>
   </use>

diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
index b7ed6eb4ffb..8aafd7f242b 100644
--- a/app-text/zathura-pdf-mupdf/metadata.xml
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>mlq@××××.org</email>

diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
index b7ed6eb4ffb..8aafd7f242b 100644
--- a/app-text/zathura-pdf-poppler/metadata.xml
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>mlq@××××.org</email>

diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
index b7ed6eb4ffb..8aafd7f242b 100644
--- a/app-text/zathura-ps/metadata.xml
+++ b/app-text/zathura-ps/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>mlq@××××.org</email>

diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index 10adea68254..fe606f0873b 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="magic">Use libmagic to determine mimetypes</flag>
 		<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>

diff --git a/dev-db/datadraw/metadata.xml b/dev-db/datadraw/metadata.xml
index 48833abaadc..ca2189f2632 100644
--- a/dev-db/datadraw/metadata.xml
+++ b/dev-db/datadraw/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
 <maintainer type="project">
 	<email>sci-electronics@g.o</email>
 	<name>Gentoo Electronics Project</name>

diff --git a/dev-db/sqlitebrowser/metadata.xml b/dev-db/sqlitebrowser/metadata.xml
index 778d9bfc728..45409a91f1e 100644
--- a/dev-db/sqlitebrowser/metadata.xml
+++ b/dev-db/sqlitebrowser/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription lang="en">
 SQLite Database Browser is a freeware, public domain, open source visual tool
 used to create, design and edit database files compatible with SQLite. It is

diff --git a/dev-libs/girara/metadata.xml b/dev-libs/girara/metadata.xml
index 6e22fb2f495..4fe191a1f33 100644
--- a/dev-libs/girara/metadata.xml
+++ b/dev-libs/girara/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <maintainer status="active">
       <email>mlq@××××.org</email>

diff --git a/dev-libs/libcli/metadata.xml b/dev-libs/libcli/metadata.xml
index 121529505d1..a31d2d70c48 100644
--- a/dev-libs/libcli/metadata.xml
+++ b/dev-libs/libcli/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">libcli provides a shared library for including a Cisco-like command-line
 		interface into other software. It's a telnet interface which supports
 		command-line editing, history, authentication and callbacks for a

diff --git a/dev-libs/libcss/metadata.xml b/dev-libs/libcss/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/dev-libs/libcss/metadata.xml
+++ b/dev-libs/libcss/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/dev-libs/libcxml/metadata.xml b/dev-libs/libcxml/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/dev-libs/libcxml/metadata.xml
+++ b/dev-libs/libcxml/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-libs/libmodbus/metadata.xml b/dev-libs/libmodbus/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/dev-libs/libmodbus/metadata.xml
+++ b/dev-libs/libmodbus/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-libs/libnsfb/metadata.xml b/dev-libs/libnsfb/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/dev-libs/libnsfb/metadata.xml
+++ b/dev-libs/libnsfb/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/dev-libs/libnsutils/metadata.xml b/dev-libs/libnsutils/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/dev-libs/libnsutils/metadata.xml
+++ b/dev-libs/libnsutils/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/dev-libs/libparserutils/metadata.xml b/dev-libs/libparserutils/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/dev-libs/libparserutils/metadata.xml
+++ b/dev-libs/libparserutils/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/dev-libs/libutf8proc/metadata.xml b/dev-libs/libutf8proc/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/dev-libs/libutf8proc/metadata.xml
+++ b/dev-libs/libutf8proc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/dev-libs/libwapcaplet/metadata.xml b/dev-libs/libwapcaplet/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/dev-libs/libwapcaplet/metadata.xml
+++ b/dev-libs/libwapcaplet/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/dev-libs/locked_sstream/metadata.xml b/dev-libs/locked_sstream/metadata.xml
index 437dd2281c4..1d02d02cd9a 100644
--- a/dev-libs/locked_sstream/metadata.xml
+++ b/dev-libs/locked_sstream/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 locked_sstream is a tiny C++ library which wraps std::stringstream in a mutex to attempt to fix crashes on OS X when multiple threads simultaneously use different stringstreams. It remains to be seen whether it fixes the problem completely, but it certainly helps.
 </longdescription>

diff --git a/dev-libs/nsgenbind/metadata.xml b/dev-libs/nsgenbind/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/dev-libs/nsgenbind/metadata.xml
+++ b/dev-libs/nsgenbind/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/dev-libs/rote/metadata.xml b/dev-libs/rote/metadata.xml
index bedda34b68c..4d070fe11b6 100644
--- a/dev-libs/rote/metadata.xml
+++ b/dev-libs/rote/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">rote</remote-id>
 	</upstream>

diff --git a/dev-libs/skalibs/metadata.xml b/dev-libs/skalibs/metadata.xml
index b538bc1f73d..993ae0503a7 100644
--- a/dev-libs/skalibs/metadata.xml
+++ b/dev-libs/skalibs/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>williamh@g.o</email>
 		<name>William Hubbs</name>

diff --git a/dev-libs/yajl/metadata.xml b/dev-libs/yajl/metadata.xml
index 5cf1579f6e2..a05a0f6df05 100644
--- a/dev-libs/yajl/metadata.xml
+++ b/dev-libs/yajl/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="project">
     <email>ruby@g.o</email>
     <name>Gentoo Ruby Project</name>

diff --git a/dev-perl/Getopt-GUI-Long/metadata.xml b/dev-perl/Getopt-GUI-Long/metadata.xml
index 3f57b241e64..aa1afcfb809 100644
--- a/dev-perl/Getopt-GUI-Long/metadata.xml
+++ b/dev-perl/Getopt-GUI-Long/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
 <maintainer type="project">
 	<email>perl@g.o</email>
 	<name>Gentoo Perl Project</name>

diff --git a/dev-python/netifaces/metadata.xml b/dev-python/netifaces/metadata.xml
index c535d0e3657..243f603592c 100644
--- a/dev-python/netifaces/metadata.xml
+++ b/dev-python/netifaces/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@g.o</email>
     <name>Python</name>

diff --git a/dev-python/pyClamd/metadata.xml b/dev-python/pyClamd/metadata.xml
index ddd3880bfcc..bfc26d648e7 100644
--- a/dev-python/pyClamd/metadata.xml
+++ b/dev-python/pyClamd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">pyClamd</remote-id>
   </upstream>

diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index 9438ce631d3..bf9cf589620 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">pycollada/pycollada</remote-id>
 	</upstream>

diff --git a/dev-python/pyldap/metadata.xml b/dev-python/pyldap/metadata.xml
index 6879e4d2de9..618e58e65d8 100644
--- a/dev-python/pyldap/metadata.xml
+++ b/dev-python/pyldap/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-		<description>Upstream of the python3 port</description>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@g.o</email>
 		<name>Python</name>

diff --git a/dev-python/pyopengl_accelerate/metadata.xml b/dev-python/pyopengl_accelerate/metadata.xml
index 73bae7cf75a..d6b7485e028 100644
--- a/dev-python/pyopengl_accelerate/metadata.xml
+++ b/dev-python/pyopengl_accelerate/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">PyOpenGL-accelerate</remote-id>
 		<remote-id type="sourceforge">pyopengl</remote-id>

diff --git a/dev-python/python-ldap/metadata.xml b/dev-python/python-ldap/metadata.xml
index 1a5aee08dfb..87424d50628 100644
--- a/dev-python/python-ldap/metadata.xml
+++ b/dev-python/python-ldap/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@g.o</email>
 		<name>Python</name>

diff --git a/dev-python/python-linux-procfs/metadata.xml b/dev-python/python-linux-procfs/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/dev-python/python-linux-procfs/metadata.xml
+++ b/dev-python/python-linux-procfs/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-python/rencode/metadata.xml b/dev-python/rencode/metadata.xml
index 5c16d3beac0..3ca1128740c 100644
--- a/dev-python/rencode/metadata.xml
+++ b/dev-python/rencode/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 The rencode module is similar to bencode from the BitTorrent project. For
 complex, heterogeneous data structures with many small elements, r-encodings

diff --git a/dev-python/thunarx-python/metadata.xml b/dev-python/thunarx-python/metadata.xml
index 7bdac6c6ba2..0bd003b69c2 100644
--- a/dev-python/thunarx-python/metadata.xml
+++ b/dev-python/thunarx-python/metadata.xml
@@ -5,8 +5,4 @@
     <email>xfce@g.o</email>
     <name>XFCE Team</name>
   </maintainer>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
-</pkgmetadata>
+  </pkgmetadata>

diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 21c4bb8fe8d..6ff16988eb4 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="cli">Enable command line interface</flag>
 		<flag name="egl">Enable EGL support</flag>

diff --git a/dev-util/biew/metadata.xml b/dev-util/biew/metadata.xml
index 5894b06df22..2c1788a22bf 100644
--- a/dev-util/biew/metadata.xml
+++ b/dev-util/biew/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">beye</remote-id>
   </upstream>

diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index 3bf4b78228a..7556003fff3 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="htmlreport">install cppcheck-htmlreport</flag>
 	</use>

diff --git a/dev-util/fatrace/metadata.xml b/dev-util/fatrace/metadata.xml
index 1c2ccfe5c94..dd6111e8854 100644
--- a/dev-util/fatrace/metadata.xml
+++ b/dev-util/fatrace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="powertop">Add powetop integration</flag>
 	</use>

diff --git a/dev-util/makeheaders/metadata.xml b/dev-util/makeheaders/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/dev-util/makeheaders/metadata.xml
+++ b/dev-util/makeheaders/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/dev-util/pycharm-community/metadata.xml
+++ b/dev-util/pycharm-community/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/dev-util/pycharm-professional/metadata.xml
+++ b/dev-util/pycharm-professional/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-util/waf/metadata.xml b/dev-util/waf/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/dev-util/waf/metadata.xml
+++ b/dev-util/waf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-vcs/rabbitvcs/metadata.xml b/dev-vcs/rabbitvcs/metadata.xml
index a2d833d6ca7..0d4e4392dd1 100644
--- a/dev-vcs/rabbitvcs/metadata.xml
+++ b/dev-vcs/rabbitvcs/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		RabbitVCS is a set of graphical tools written to provide
 		simple and straightforward access to the version control systems you use.

diff --git a/games-misc/lucidlife/metadata.xml b/games-misc/lucidlife/metadata.xml
index abfb35545a8..8301b92ba30 100644
--- a/games-misc/lucidlife/metadata.xml
+++ b/games-misc/lucidlife/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
 <maintainer type="project">
 <email>games@g.o</email>
 <name>Gentoo Games Project</name>

diff --git a/games-simulation/crrcsim/metadata.xml b/games-simulation/crrcsim/metadata.xml
index 9bc28cff476..99cf739c786 100644
--- a/games-simulation/crrcsim/metadata.xml
+++ b/games-simulation/crrcsim/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>games@g.o</email>
 		<name>Gentoo Games Project</name>

diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
index 2c4b6c6ef09..59f04d03a3a 100644
--- a/gnustep-apps/sogo/metadata.xml
+++ b/gnustep-apps/sogo/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>gnustep@g.o</email>
 		<name>Gentoo GNUstep Project</name>

diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml
index 57b2b4522b3..0d58bf52f8c 100644
--- a/gnustep-libs/sope/metadata.xml
+++ b/gnustep-libs/sope/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>gnustep@g.o</email>
 		<name>Gentoo GNUstep Project</name>

diff --git a/media-fonts/termsyn/metadata.xml b/media-fonts/termsyn/metadata.xml
index 93793950c80..3ee2cbfa767 100644
--- a/media-fonts/termsyn/metadata.xml
+++ b/media-fonts/termsyn/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">termsyn</remote-id>
 	</upstream>

diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml
index e6946010490..d242506999a 100644
--- a/media-gfx/fim/metadata.xml
+++ b/media-gfx/fim/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>graphics@g.o</email>
 		<name>Gentoo Graphics Project</name>

diff --git a/media-gfx/icc_examin/metadata.xml b/media-gfx/icc_examin/metadata.xml
index 6f707326940..322fc08818e 100644
--- a/media-gfx/icc_examin/metadata.xml
+++ b/media-gfx/icc_examin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">oyranos-cms/icc-examin</remote-id>
 		<remote-id type="sourceforge">oyranos</remote-id>

diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 9e07fd9d783..a11c32d6c96 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>michael weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 OpenSCAD is a software for creating solid 3D CAD objects.  Unlike most free software for creating 3D models (such as the famous application Blender) it does not focus on the artistic aspects of 3D modelling but instead on the CAD aspects. Thus it might be the application you are looking for when you are planning to create 3D models of machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies.  OpenSCAD is free software and available for Linux/UNIX, MS Windows and Mac OS X.
 	</longdescription>

diff --git a/media-gfx/recoverjpeg/metadata.xml b/media-gfx/recoverjpeg/metadata.xml
index d15a3ebeaa1..6f49eba8f49 100644
--- a/media-gfx/recoverjpeg/metadata.xml
+++ b/media-gfx/recoverjpeg/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>xmw@g.o</email>
-  <name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 4c17cb6e9bf..20edbb2faec 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">zbar</remote-id>
 	</upstream>

diff --git a/media-libs/icc-profiles-basiccolor-printing2009/metadata.xml b/media-libs/icc-profiles-basiccolor-printing2009/metadata.xml
index 47e65fb955c..876510cfb96 100644
--- a/media-libs/icc-profiles-basiccolor-printing2009/metadata.xml
+++ b/media-libs/icc-profiles-basiccolor-printing2009/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">openicc</remote-id>
 	</upstream>

diff --git a/media-libs/icc-profiles-openicc/metadata.xml b/media-libs/icc-profiles-openicc/metadata.xml
index 47e65fb955c..876510cfb96 100644
--- a/media-libs/icc-profiles-openicc/metadata.xml
+++ b/media-libs/icc-profiles-openicc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">openicc</remote-id>
 	</upstream>

diff --git a/media-libs/libXcm/metadata.xml b/media-libs/libXcm/metadata.xml
index 9497524e4a7..b6513109fac 100644
--- a/media-libs/libXcm/metadata.xml
+++ b/media-libs/libXcm/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">oyranos-cms/libxcm</remote-id>
 		<remote-id type="sourceforge">oyranos</remote-id>

diff --git a/media-libs/libasdcp-cth/metadata.xml b/media-libs/libasdcp-cth/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/media-libs/libasdcp-cth/metadata.xml
+++ b/media-libs/libasdcp-cth/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/media-libs/libbmp/metadata.xml b/media-libs/libbmp/metadata.xml
index 8c83fdb86be..d95355c9226 100644
--- a/media-libs/libbmp/metadata.xml
+++ b/media-libs/libbmp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 libbmp is a simple, cross-platform, open source (revised LGPL) C library designed for easily reading, writing, and modifying Windows bitmap (BMP) image files. The library is oriented towards the novice programmer with little formal experience, but it is sufficiently capable for anybody who desires to do I/O and pixel operations on uncompressed 1, 4, 8, 16, 24, and 32 bpp (bits per pixel) BMP files.
 </longdescription>

diff --git a/media-libs/libdcp/metadata.xml b/media-libs/libdcp/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/media-libs/libdcp/metadata.xml
+++ b/media-libs/libdcp/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/media-libs/libnsbmp/metadata.xml b/media-libs/libnsbmp/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/media-libs/libnsbmp/metadata.xml
+++ b/media-libs/libnsbmp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/media-libs/libnsgif/metadata.xml b/media-libs/libnsgif/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/media-libs/libnsgif/metadata.xml
+++ b/media-libs/libnsgif/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/media-libs/libnspsl/metadata.xml b/media-libs/libnspsl/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/media-libs/libnspsl/metadata.xml
+++ b/media-libs/libnspsl/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/media-libs/librosprite/metadata.xml b/media-libs/librosprite/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/media-libs/librosprite/metadata.xml
+++ b/media-libs/librosprite/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/media-libs/libsub/metadata.xml b/media-libs/libsub/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/media-libs/libsub/metadata.xml
+++ b/media-libs/libsub/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/media-libs/libsvgtiny/metadata.xml b/media-libs/libsvgtiny/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/media-libs/libsvgtiny/metadata.xml
+++ b/media-libs/libsvgtiny/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml
index 390440d4d20..785c991172d 100644
--- a/media-libs/oyranos/metadata.xml
+++ b/media-libs/oyranos/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">oyranos-cms/oyranos</remote-id>
 	</upstream>

diff --git a/media-libs/raspberrypi-userland-bin/metadata.xml b/media-libs/raspberrypi-userland-bin/metadata.xml
index 4bc28a96683..43773231f6e 100644
--- a/media-libs/raspberrypi-userland-bin/metadata.xml
+++ b/media-libs/raspberrypi-userland-bin/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="hardfp">Use armv6 hardfp ABI</flag>
 	</use>

diff --git a/media-radio/KochMorse/metadata.xml b/media-radio/KochMorse/metadata.xml
index 09c82e749b5..2dd58bbfe60 100644
--- a/media-radio/KochMorse/metadata.xml
+++ b/media-radio/KochMorse/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">KochMorse</remote-id>
 	</upstream>

diff --git a/media-sound/baudline/metadata.xml b/media-sound/baudline/metadata.xml
index 13c289ccad7..f9d9c0fca82 100644
--- a/media-sound/baudline/metadata.xml
+++ b/media-sound/baudline/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 Baudline is a time-frequency browser designed for scientific visualization of the spectral domain.  Signal analysis is performed by Fourier, correlation, and raster transforms that create colorful spectrograms with vibrant detail.  Conduct test and measurement experiments with the built in function generator, or play back audio files with a multitude of effects and filters.  The baudline signal analyzer combines fast digital signal processing, versatile high speed displays, and continuous capture tools for hunting down and studying elusive signal characteristics.
 </longdescription>

diff --git a/media-sound/spek/metadata.xml b/media-sound/spek/metadata.xml
index b809ea2b22b..2f596d79702 100644
--- a/media-sound/spek/metadata.xml
+++ b/media-sound/spek/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">spek</remote-id>
 		<remote-id type="github">alexkay/spek</remote-id>

diff --git a/media-video/dcpomatic/metadata.xml b/media-video/dcpomatic/metadata.xml
index 1fe7fe154da..192510bcea5 100644
--- a/media-video/dcpomatic/metadata.xml
+++ b/media-video/dcpomatic/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 DCP-o-matic is a free, open-source program to create Digital Cinema Packages (DCPs) from videos, images, sound and subtitle files. You can use it to make content for playback on DCI-compliant cinema projectors.
 

diff --git a/net-analyzer/bing/metadata.xml b/net-analyzer/bing/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/net-analyzer/bing/metadata.xml
+++ b/net-analyzer/bing/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-analyzer/dietsniff/metadata.xml b/net-analyzer/dietsniff/metadata.xml
index 87b0150feae..9a1ccff140a 100644
--- a/net-analyzer/dietsniff/metadata.xml
+++ b/net-analyzer/dietsniff/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<bugs-to>https://github.com/hynek/dietsniff/issues</bugs-to>
 		<maintainer status="active">

diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-analyzer/netsniff-ng/metadata.xml
+++ b/net-analyzer/netsniff-ng/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml
index d04de4894ed..6f49eba8f49 100644
--- a/net-analyzer/tcping/metadata.xml
+++ b/net-analyzer/tcping/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-analyzer/thc-ipv6/metadata.xml b/net-analyzer/thc-ipv6/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-analyzer/thc-ipv6/metadata.xml
+++ b/net-analyzer/thc-ipv6/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-dns/dnssec-check/metadata.xml b/net-dns/dnssec-check/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-dns/dnssec-check/metadata.xml
+++ b/net-dns/dnssec-check/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-dns/dnssec-root/metadata.xml b/net-dns/dnssec-root/metadata.xml
index c6775aa5c0c..eb73fc38149 100644
--- a/net-dns/dnssec-root/metadata.xml
+++ b/net-dns/dnssec-root/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>xmw@g.o</email>
-  <name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>This package distributes the ICANN DNSSEC root key</longdescription>
 </pkgmetadata>

diff --git a/net-dns/dnssec-tools/metadata.xml b/net-dns/dnssec-tools/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-dns/dnssec-tools/metadata.xml
+++ b/net-dns/dnssec-tools/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-dns/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index 6f3178436bb..7206094d0b0 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="ecdsa-check">Requires openssl[-bindist]</flag>
 </use>

diff --git a/net-dns/dnstop/metadata.xml b/net-dns/dnstop/metadata.xml
index 869cb9ae09a..b8fe5c1e5d6 100644
--- a/net-dns/dnstop/metadata.xml
+++ b/net-dns/dnstop/metadata.xml
@@ -5,10 +5,6 @@
   <email>hendrik@××××××××××.de</email>
   <name>Hendrik v. Raven</name>
 </maintainer>
-<maintainer type="person">
-  <email>xmw@g.o</email>
-  <name>Michael Weber</name>
-</maintainer>
 <maintainer type="project">
   <email>proxy-maint@g.o</email>
   <name>Proxy Maintainers</name>

diff --git a/net-dns/totd/metadata.xml b/net-dns/totd/metadata.xml
index d71991b3359..df1c7e1ff53 100644
--- a/net-dns/totd/metadata.xml
+++ b/net-dns/totd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Totd ( Trick Or Treat Daemon ) is a small DNS proxy nameserver that
 		supports IPv6 only hosts/networks that communicate with the IPv4 world

diff --git a/net-ftp/oftpd/metadata.xml b/net-ftp/oftpd/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/net-ftp/oftpd/metadata.xml
+++ b/net-ftp/oftpd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-libs/enet/metadata.xml b/net-libs/enet/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-libs/enet/metadata.xml
+++ b/net-libs/enet/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/net-libs/libdom/metadata.xml
+++ b/net-libs/libdom/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index 68674fe1b80..88de5fc462b 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/net-libs/nacl/metadata.xml b/net-libs/nacl/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-libs/nacl/metadata.xml
+++ b/net-libs/nacl/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-mail/fdm/metadata.xml b/net-mail/fdm/metadata.xml
index 0366e483b63..dae07138c6d 100644
--- a/net-mail/fdm/metadata.xml
+++ b/net-mail/fdm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="courierauth">Add support for Courier authentication library</flag>
   </use>

diff --git a/net-misc/aget/metadata.xml b/net-misc/aget/metadata.xml
index 8fa258745ec..f863fa42dce 100644
--- a/net-misc/aget/metadata.xml
+++ b/net-misc/aget/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>Aget fetches HTTP URLs in a manner similar to wget, but segments the retrieval into multiple parts to increase download speed. It can be many times as fast as wget in some circumstances.</longdescription>
 <longdescription lang="ja">
 Aget は wget 風の振舞いで URL 上から HTTP 経由で取り寄せますが、異なる点としてはダウンロードのスピードアップのため対象を分割します。分割しても wget と変わらない場合もあります。

diff --git a/net-misc/arpd/metadata.xml b/net-misc/arpd/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/net-misc/arpd/metadata.xml
+++ b/net-misc/arpd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-misc/balance/metadata.xml b/net-misc/balance/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/net-misc/balance/metadata.xml
+++ b/net-misc/balance/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-misc/batctl/metadata.xml
+++ b/net-misc/batctl/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-misc/batman-adv/metadata.xml b/net-misc/batman-adv/metadata.xml
index dd744838a0e..399595c2621 100644
--- a/net-misc/batman-adv/metadata.xml
+++ b/net-misc/batman-adv/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="bla">B.A.T.M.A.N. bridge loop avoidance</flag>
 	<flag name="dat">B.A.T.M.A.N. distributed arp table</flag>

diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml
index bd537594c88..b939f35668c 100644
--- a/net-misc/gofish/metadata.xml
+++ b/net-misc/gofish/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">gofish</remote-id>
 	</upstream>

diff --git a/net-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
index 9fcc5c61b40..c93b1aebf69 100644
--- a/net-misc/hotot/metadata.xml
+++ b/net-misc/hotot/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="chrome">Build chrome browser extension</flag>
 	</use>

diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
index f7fb57167ee..46f1937fc92 100644
--- a/net-misc/knock/metadata.xml
+++ b/net-misc/knock/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="server">Installs the knockd server daemon.</flag>
 	</use>

diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml
index 8dd2bc50e04..3427c8a8338 100644
--- a/net-misc/minidlna/metadata.xml
+++ b/net-misc/minidlna/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<bugs-to>https://sourceforge.net/p/minidlna/bugs/</bugs-to>
 	<remote-id type="sourceforge">minidlna</remote-id>

diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 5f24fe90f47..60cf94f0567 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>monsieurp@g.o</email>
 		<name>Patrice Clement</name>

diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index c04ba062f30..f0915952f0f 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 "ncp" is a utility for copying files in a LAN. It has absolutely no security or integrity checking, no throttling, no features, except one: you don't have to type the coordinates of your peer.
 </longdescription>

diff --git a/net-misc/ndisc6/metadata.xml b/net-misc/ndisc6/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-misc/ndisc6/metadata.xml
+++ b/net-misc/ndisc6/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-misc/netkit-bootparamd/metadata.xml b/net-misc/netkit-bootparamd/metadata.xml
index dde8ad44195..a7c2c47d440 100644
--- a/net-misc/netkit-bootparamd/metadata.xml
+++ b/net-misc/netkit-bootparamd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
 </use>

diff --git a/net-misc/netkit-bootpd/metadata.xml b/net-misc/netkit-bootpd/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/net-misc/netkit-bootpd/metadata.xml
+++ b/net-misc/netkit-bootpd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
index 8307f5e2d4f..3ffdeb4af3b 100644
--- a/net-misc/radvd/metadata.xml
+++ b/net-misc/radvd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>prometheanfire@g.o</email>
 		<name>Matthew Thode</name>

diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
index 4db7e6baf41..08681bd3b2b 100644
--- a/net-misc/rancid-git/metadata.xml
+++ b/net-misc/rancid-git/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="git">Enable git (version control system) support</flag>
 	</use>

diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
index d04de4894ed..6f49eba8f49 100644
--- a/net-misc/rancid/metadata.xml
+++ b/net-misc/rancid/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-misc/secpanel/metadata.xml b/net-misc/secpanel/metadata.xml
index 15e1a0cb3d0..1b85bde1b11 100644
--- a/net-misc/secpanel/metadata.xml
+++ b/net-misc/secpanel/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		SecPanel serves as a graphical user interface for managing and running
 		SSH (Secure Shell) and SCP (Secure Copy) connections.

diff --git a/net-nds/ldapvi/metadata.xml b/net-nds/ldapvi/metadata.xml
index 9a74198dc6b..4b38083d2f2 100644
--- a/net-nds/ldapvi/metadata.xml
+++ b/net-nds/ldapvi/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription lang="en">
 		Text based LDAP client which uses your standard editor for viewing and
 		changing entries.

diff --git a/net-p2p/ncdc/metadata.xml b/net-p2p/ncdc/metadata.xml
index 30addd3b610..e7b7a1db4dc 100644
--- a/net-p2p/ncdc/metadata.xml
+++ b/net-p2p/ncdc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<maintainer status="active">
 		<email>projects@××××××.nl</email>

diff --git a/net-p2p/transmission-remote-cli/metadata.xml b/net-p2p/transmission-remote-cli/metadata.xml
index f9835acf5ca..eb9d94cd000 100644
--- a/net-p2p/transmission-remote-cli/metadata.xml
+++ b/net-p2p/transmission-remote-cli/metadata.xml
@@ -5,10 +5,6 @@
 		<email>hendrik@××××××××××.de</email>
 		<name>Hendrik v. Raven (lorem_ipsum)</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@g.o</email>
 		<name>Proxy Maintainers</name>

diff --git a/net-proxy/tayga/metadata.xml b/net-proxy/tayga/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-proxy/tayga/metadata.xml
+++ b/net-proxy/tayga/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-vpn/aiccu/metadata.xml b/net-vpn/aiccu/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-vpn/aiccu/metadata.xml
+++ b/net-vpn/aiccu/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-vpn/isatapd/metadata.xml b/net-vpn/isatapd/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/net-vpn/isatapd/metadata.xml
+++ b/net-vpn/isatapd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-wireless/dump1090/metadata.xml b/net-wireless/dump1090/metadata.xml
index 04a99188b5e..88faf189fed 100644
--- a/net-wireless/dump1090/metadata.xml
+++ b/net-wireless/dump1090/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>radio@g.o</email>
 		<name>Radio</name>

diff --git a/net-wireless/horst/metadata.xml b/net-wireless/horst/metadata.xml
index 205b06d33b2..cf7bc3e2823 100644
--- a/net-wireless/horst/metadata.xml
+++ b/net-wireless/horst/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="pcap">Add support for network packet capture via net-libs/libpcap</flag>
 	</use>

diff --git a/sci-electronics/netgen/metadata.xml b/sci-electronics/netgen/metadata.xml
index c15c8e2e96e..5935c2fc952 100644
--- a/sci-electronics/netgen/metadata.xml
+++ b/sci-electronics/netgen/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-electronics@g.o</email>
     <name>Gentoo Electronics Project</name>

diff --git a/sci-electronics/osqoop/metadata.xml b/sci-electronics/osqoop/metadata.xml
index 3c3d5ced641..7a38bb90096 100644
--- a/sci-electronics/osqoop/metadata.xml
+++ b/sci-electronics/osqoop/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sci-electronics/xoscope/metadata.xml b/sci-electronics/xoscope/metadata.xml
index c0bad508a58..7c51f11a059 100644
--- a/sci-electronics/xoscope/metadata.xml
+++ b/sci-electronics/xoscope/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-electronics@g.o</email>
 		<name>Gentoo Electronics Project</name>

diff --git a/sci-geosciences/gpxpy/metadata.xml b/sci-geosciences/gpxpy/metadata.xml
index 44a886f8d0f..de597e19e44 100644
--- a/sci-geosciences/gpxpy/metadata.xml
+++ b/sci-geosciences/gpxpy/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tkrajina/gpxpy</remote-id>
 	</upstream>

diff --git a/sci-libs/opencascade/metadata.xml b/sci-libs/opencascade/metadata.xml
index 7a267cb2e3b..ac137460a1e 100644
--- a/sci-libs/opencascade/metadata.xml
+++ b/sci-libs/opencascade/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="freeimage">Enable support for image i/o via media-libs/freeimage</flag>
     <flag name="gl2ps">Use gl2ps PostScript printing library</flag>

diff --git a/sci-misc/mendeleydesktop/metadata.xml b/sci-misc/mendeleydesktop/metadata.xml
index 3f93cc78c97..c9fe662402e 100644
--- a/sci-misc/mendeleydesktop/metadata.xml
+++ b/sci-misc/mendeleydesktop/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</name>
-  </maintainer>
   <maintainer type="person">
     <email>marbre@××××××××××××××.de</email>
     <name>Marius Brehler</name>

diff --git a/sys-auth/fingerprint-gui/metadata.xml b/sys-auth/fingerprint-gui/metadata.xml
index e5fd1a62181..4905ac7e34f 100644
--- a/sys-auth/fingerprint-gui/metadata.xml
+++ b/sys-auth/fingerprint-gui/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 	<flag name="upekbsapi">Add UPEK BSAPI drivers for identify functions on some readers</flag>
 </use>

diff --git a/sys-auth/fprint_demo/metadata.xml b/sys-auth/fprint_demo/metadata.xml
index ac0d76154a7..25c54caae4b 100644
--- a/sys-auth/fprint_demo/metadata.xml
+++ b/sys-auth/fprint_demo/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber (xmw)</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fprint</remote-id>
 	</upstream>

diff --git a/sys-auth/fprintd/metadata.xml b/sys-auth/fprintd/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/sys-auth/fprintd/metadata.xml
+++ b/sys-auth/fprintd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-auth/libfprint/metadata.xml b/sys-auth/libfprint/metadata.xml
index 94aee5a2fc6..db0eade3bc1 100644
--- a/sys-auth/libfprint/metadata.xml
+++ b/sys-auth/libfprint/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
 <maintainer type="person">
 	<email>zlogene@g.o</email>
 	<name>Mikle Kolyada</name>

diff --git a/sys-auth/libnss-cache/metadata.xml b/sys-auth/libnss-cache/metadata.xml
index b52fc03c3e4..30e39b09e43 100644
--- a/sys-auth/libnss-cache/metadata.xml
+++ b/sys-auth/libnss-cache/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">nsscache</remote-id>
 		<remote-id type="github">google/nsscache</remote-id>

diff --git a/sys-auth/pam_fprint/metadata.xml b/sys-auth/pam_fprint/metadata.xml
index 5dc8ba080c0..25c54caae4b 100644
--- a/sys-auth/pam_fprint/metadata.xml
+++ b/sys-auth/pam_fprint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fprint</remote-id>
 	</upstream>

diff --git a/sys-auth/thinkfinger/metadata.xml b/sys-auth/thinkfinger/metadata.xml
index 5fbf3564c70..424b10fc438 100644
--- a/sys-auth/thinkfinger/metadata.xml
+++ b/sys-auth/thinkfinger/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="sourceforge">ThinkFinger</remote-id>
 </upstream>

diff --git a/sys-boot/raspberrypi-firmware/metadata.xml b/sys-boot/raspberrypi-firmware/metadata.xml
index 97bc2542560..7775715c3da 100644
--- a/sys-boot/raspberrypi-firmware/metadata.xml
+++ b/sys-boot/raspberrypi-firmware/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
 	</upstream>

diff --git a/sys-boot/raspberrypi-mkimage/metadata.xml b/sys-boot/raspberrypi-mkimage/metadata.xml
index de18e3066ff..03d6b306d32 100644
--- a/sys-boot/raspberrypi-mkimage/metadata.xml
+++ b/sys-boot/raspberrypi-mkimage/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">raspberrypi/tools</remote-id>
 	</upstream>

diff --git a/sys-fs/ncdu/metadata.xml b/sys-fs/ncdu/metadata.xml
index 1dc620f7b66..82b99a853f6 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 "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@g.o</email>
-    <name>Michael Weber</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
@@ -12,4 +9,3 @@ your disk space going? Why is your home directory that large? ncdu can answer
 those questions for you in just a matter of seconds!
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-kernel/raspberrypi-image/metadata.xml b/sys-kernel/raspberrypi-image/metadata.xml
index 97bc2542560..7775715c3da 100644
--- a/sys-kernel/raspberrypi-image/metadata.xml
+++ b/sys-kernel/raspberrypi-image/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">raspberrypi/firmware</remote-id>
 	</upstream>

diff --git a/sys-kernel/raspberrypi-sources/metadata.xml b/sys-kernel/raspberrypi-sources/metadata.xml
index 5ffcbcc0db2..7d0732dc62d 100644
--- a/sys-kernel/raspberrypi-sources/metadata.xml
+++ b/sys-kernel/raspberrypi-sources/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">raspberrypi/linux</remote-id>
 	</upstream>

diff --git a/sys-power/phc-intel/metadata.xml b/sys-power/phc-intel/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/sys-power/phc-intel/metadata.xml
+++ b/sys-power/phc-intel/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-power/suspend/metadata.xml b/sys-power/suspend/metadata.xml
index e7ac10aee5e..886b7a4a794 100644
--- a/sys-power/suspend/metadata.xml
+++ b/sys-power/suspend/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>bircoph@g.o</email>
 		<name>Andrew Savchenko</name>

diff --git a/www-apps/blazeblogger/metadata.xml b/www-apps/blazeblogger/metadata.xml
index c2f03805ce8..8d99d982540 100644
--- a/www-apps/blazeblogger/metadata.xml
+++ b/www-apps/blazeblogger/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">blazeblogger</remote-id>
 	</upstream>

diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index 579e62fe44c..ef834d041ec 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>vdupras@g.o</email>
 		<name>Virgil Dupras</name>

diff --git a/www-plugins/mozplugger/metadata.xml b/www-plugins/mozplugger/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/www-plugins/mozplugger/metadata.xml
+++ b/www-plugins/mozplugger/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml
index 54b59b40ec8..74c404fc506 100644
--- a/x11-libs/gtkdatabox/metadata.xml
+++ b/x11-libs/gtkdatabox/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-electronics@g.o</email>
 		<name>Gentoo Electronics Project</name>

diff --git a/x11-misc/simpleswitcher/metadata.xml b/x11-misc/simpleswitcher/metadata.xml
index 99291475200..ee030c595f5 100644
--- a/x11-misc/simpleswitcher/metadata.xml
+++ b/x11-misc/simpleswitcher/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/simpleswitcher</remote-id>
 	</upstream>

diff --git a/x11-misc/trayer-srg/metadata.xml b/x11-misc/trayer-srg/metadata.xml
index 2b3e45adfea..cc281183410 100644
--- a/x11-misc/trayer-srg/metadata.xml
+++ b/x11-misc/trayer-srg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">sargon/trayer-srg</remote-id>
 	</upstream>

diff --git a/x11-misc/wmname/metadata.xml b/x11-misc/wmname/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/x11-misc/wmname/metadata.xml
+++ b/x11-misc/wmname/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-misc/xwinwrap/metadata.xml b/x11-misc/xwinwrap/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/x11-misc/xwinwrap/metadata.xml
+++ b/x11-misc/xwinwrap/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-plugins/pidgin-led-notification/metadata.xml b/x11-plugins/pidgin-led-notification/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/x11-plugins/pidgin-led-notification/metadata.xml
+++ b/x11-plugins/pidgin-led-notification/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-plugins/pidgin-privacy-please/metadata.xml b/x11-plugins/pidgin-privacy-please/metadata.xml
index 9b7f6063f65..023aa626319 100644
--- a/x11-plugins/pidgin-privacy-please/metadata.xml
+++ b/x11-plugins/pidgin-privacy-please/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">pidgin-privacy-please</remote-id>
 	</upstream>

diff --git a/x11-terms/st/metadata.xml b/x11-terms/st/metadata.xml
index 58be0fec078..5ba62861f1c 100644
--- a/x11-terms/st/metadata.xml
+++ b/x11-terms/st/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
-<maintainer type="person">
 <email>jer@g.o</email>
 </maintainer>
 </pkgmetadata>

diff --git a/x11-wm/cwm/metadata.xml b/x11-wm/cwm/metadata.xml
index e13fa1e0d22..9dddd6338e3 100644
--- a/x11-wm/cwm/metadata.xml
+++ b/x11-wm/cwm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@g.o</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">chneukirchen/cwm</remote-id>
 	</upstream>

diff --git a/x11-wm/sithwm/metadata.xml b/x11-wm/sithwm/metadata.xml
index 9c5efbe2fc4..a177aaf005a 100644
--- a/x11-wm/sithwm/metadata.xml
+++ b/x11-wm/sithwm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<remote-id type="sourceforge">sithwm</remote-id>
 	<bugs-to>https://sourceforge.net/p/sithwm/bugs/</bugs-to>

diff --git a/x11-wm/spectrwm/metadata.xml b/x11-wm/spectrwm/metadata.xml
index a535b885282..6f49eba8f49 100644
--- a/x11-wm/spectrwm/metadata.xml
+++ b/x11-wm/spectrwm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@g.o</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index d8680e04081..1f15d245314 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>xmw@g.o</email>
-	<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
 </upstream>