[gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/, app-text/diction/, app-text/teseq/, sci-calculators/datamash/, ...

[Michał Górny]

ent/opera-beta/metadata.xml www-client/opera-developer/metadata.xml www-client/opera/metadata.xml www-client/otter/metadata.xml www-client/surf/metadata.xml www-client/surfraw/metadata.xml www-client/vivaldi-snapshot/metadata.xml www-client/vivaldi/metadata.xml www-plugins/adobe-flash/metadata.xml x11-drivers/nvidia-drivers/metadata.xml x11-libs/libvdpau/metadata.xml x11-misc/dmenu/metadata.xml x11-misc/rofi/metadata.xml x11-misc/sent/metadata.xml x11-misc/slock/metadata.xml x11-misc/sprop/metadata.xml x11-misc/sselp/metadata.xml x11-misc/tabbed/metadata.xml x11-misc/vdpauinfo/metadata.xml x11-misc/xidle/metadata.xml x11-misc/xkbset/metadata.xml x11-misc/xowl/metadata.xml x11-misc/xssstate/metadata.xml x11-terms/lilyterm/metadata.xml x11-terms/rxvt-unicode/metadata.xml x11-terms/st/metadata.xml x11-terms/yeahconsole/metadata.xml x11-wm/aewm/metadata.xml x11-wm/goomwwm/metadata.xml x11-wm/herbstluftwm/metadata.xml x11-wm/musca/metadata.xml x11-wm/pekwm/metadata.xml x11-wm/ratpoison/me
 tadata.xml x11-wm/wmfs/metadata.xml x11-wm/xoat/metadata.xml
X-VCS-Directories: dev-libs/libstrl/ sys-boot/unetbootin/ net-libs/nodejs/ dev-util/difffilter/ dev-embedded/stm32flash/ dev-util/splint/ media-gfx/fbida/ x11-wm/ratpoison/ x11-terms/rxvt-unicode/ media-gfx/farbfeld/ x11-misc/sselp/ x11-wm/aewm/ app-misc/figlet/ sys-fs/jmtpfs/ net-libs/wvstreams/ x11-misc/xowl/ x11-terms/lilyterm/ net-analyzer/ifstat/ x11-wm/musca/ sys-block/viaideinfo/ net-misc/whatmask/ www-client/vivaldi-snapshot/ net-misc/olsrd/ dev-vcs/cssc/ app-arch/mt-st/ sys-fs/fatresize/ app-text/wscr/ www-client/opera-developer/ net-misc/chrony/ net-dialup/wvdial/ x11-misc/rofi/ app-admin/sysstat/ app-text/jo/ sys-power/powernowd/ media-gfx/scrot/ net-misc/putty/ x11-misc/sent/ media-sound/ncmpcpp/ x11-misc/xidle/ app-admin/fam/ app-editors/sandy/ x11-misc/vdpauinfo/ x11-terms/yeahconsole/ x11-misc/dmenu/ net-misc/apt-cacher-ng/ dev-util/cppi/ www-client/surf/ app-admin/killproc/ app-benchmarks/nbench/ app-portage/euses/ www-plugins/adobe-flash/ app-text/pinfo/ sci-calculat
 ors/units/ app-admin/lib_users/ x11-wm/xoat/ x11-libs/libvdpau/ net-misc/youtube-dl/ www-client/vivaldi/ x11-misc/xssstate/ x11-terms/st/ www-client/otter/ x11-misc/tabbed/ dev-libs/libuv/ media-gfx/wings/ app-admin/whowatch/ dev-libs/dmalloc/ media-gfx/imv/ net-ftp/lftp/ app-text/diction/ sci-calculators/datamash/ app-text/teseq/ x11-drivers/nvidia-drivers/ x11-wm/wmfs/ sys-apps/pv/ x11-wm/pekwm/ dev-libs/libevent/ www-client/surfraw/ x11-wm/herbstluftwm/ dev-libs/liblinear/ net-analyzer/dhcp_probe/ www-client/opera/ dev-util/redo/ net-dns/libidn/ net-libs/http-parser/ net-ftp/ncftp/ net-dns/idnkit/ x11-misc/slock/ dev-util/indent/ net-analyzer/odhcploc/ net-dns/libidn2/ x11-misc/sprop/ media-video/blind/ www-client/opera-beta/ dev-libs/libconfig/ dev-libs/cl/ dev-util/complexity/ app-misc/cmatrix/ app-shells/bashish/ x11-wm/goomwwm/ app-text/an/ x11-misc/xkbset/ dev-util/rej/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: a39de70660d29970e5382077f18b7e5304c5bfe1
X-VCS-Branch: master
Date: Tue,  3 Nov 2020 21:32:26 +0000 (UTC)

commit:     a39de70660d29970e5382077f18b7e5304c5bfe1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  3 21:25:05 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Nov  3 21:32:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a39de706

*/*: Reassign jer's packages

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-admin/fam/metadata.xml               | 5 +----
 app-admin/killproc/metadata.xml          | 4 +---
 app-admin/lib_users/metadata.xml         | 6 +-----
 app-admin/sysstat/metadata.xml           | 5 +----
 app-admin/whowatch/metadata.xml          | 5 +----
 app-arch/mt-st/metadata.xml              | 7 ++-----
 app-benchmarks/nbench/metadata.xml       | 5 +----
 app-editors/sandy/metadata.xml           | 4 +---
 app-misc/cmatrix/metadata.xml            | 4 +---
 app-misc/figlet/metadata.xml             | 4 +---
 app-portage/euses/metadata.xml           | 4 ----
 app-shells/bashish/metadata.xml          | 5 +----
 app-text/an/metadata.xml                 | 5 +----
 app-text/diction/metadata.xml            | 4 ----
 app-text/jo/metadata.xml                 | 6 ++----
 app-text/pinfo/metadata.xml              | 4 +---
 app-text/teseq/metadata.xml              | 4 +---
 app-text/wscr/metadata.xml               | 4 +---
 dev-embedded/stm32flash/metadata.xml     | 5 +----
 dev-libs/cl/metadata.xml                 | 7 ++-----
 dev-libs/dmalloc/metadata.xml            | 5 +----
 dev-libs/libconfig/metadata.xml          | 5 +----
 dev-libs/libevent/metadata.xml           | 7 ++-----
 dev-libs/liblinear/metadata.xml          | 5 +----
 dev-libs/libstrl/metadata.xml            | 4 +---
 dev-libs/libuv/metadata.xml              | 3 ---
 dev-util/complexity/metadata.xml         | 5 +----
 dev-util/cppi/metadata.xml               | 5 +----
 dev-util/difffilter/metadata.xml         | 4 +---
 dev-util/indent/metadata.xml             | 5 +----
 dev-util/redo/metadata.xml               | 4 +---
 dev-util/rej/metadata.xml                | 5 +----
 dev-util/splint/metadata.xml             | 5 +----
 dev-vcs/cssc/metadata.xml                | 4 +---
 media-gfx/farbfeld/metadata.xml          | 5 +----
 media-gfx/fbida/metadata.xml             | 4 +---
 media-gfx/imv/metadata.xml               | 8 ++++----
 media-gfx/scrot/metadata.xml             | 4 +---
 media-gfx/wings/metadata.xml             | 4 +---
 media-sound/ncmpcpp/metadata.xml         | 3 ---
 media-video/blind/metadata.xml           | 4 +---
 net-analyzer/dhcp_probe/metadata.xml     | 4 ----
 net-analyzer/ifstat/metadata.xml         | 3 ---
 net-analyzer/odhcploc/metadata.xml       | 4 ----
 net-dialup/wvdial/metadata.xml           | 4 +---
 net-dns/idnkit/metadata.xml              | 4 +---
 net-dns/libidn/metadata.xml              | 5 +----
 net-dns/libidn2/metadata.xml             | 4 +---
 net-ftp/lftp/metadata.xml                | 5 +----
 net-ftp/ncftp/metadata.xml               | 5 +----
 net-libs/http-parser/metadata.xml        | 4 +---
 net-libs/nodejs/metadata.xml             | 4 +---
 net-libs/wvstreams/metadata.xml          | 4 +---
 net-misc/apt-cacher-ng/metadata.xml      | 4 ----
 net-misc/chrony/metadata.xml             | 4 +---
 net-misc/olsrd/metadata.xml              | 6 ++----
 net-misc/putty/metadata.xml              | 5 +----
 net-misc/whatmask/metadata.xml           | 5 +----
 net-misc/youtube-dl/metadata.xml         | 4 +---
 sci-calculators/datamash/metadata.xml    | 8 +++-----
 sci-calculators/units/metadata.xml       | 5 +----
 sys-apps/pv/metadata.xml                 | 5 +----
 sys-block/viaideinfo/metadata.xml        | 5 +----
 sys-boot/unetbootin/metadata.xml         | 5 +----
 sys-fs/fatresize/metadata.xml            | 4 +---
 sys-fs/jmtpfs/metadata.xml               | 4 +---
 sys-power/powernowd/metadata.xml         | 4 +---
 www-client/opera-beta/metadata.xml       | 5 +----
 www-client/opera-developer/metadata.xml  | 5 +----
 www-client/opera/metadata.xml            | 5 +----
 www-client/otter/metadata.xml            | 5 +----
 www-client/surf/metadata.xml             | 4 +---
 www-client/surfraw/metadata.xml          | 4 ----
 www-client/vivaldi-snapshot/metadata.xml | 5 +----
 www-client/vivaldi/metadata.xml          | 5 +----
 www-plugins/adobe-flash/metadata.xml     | 3 ---
 x11-drivers/nvidia-drivers/metadata.xml  | 4 +---
 x11-libs/libvdpau/metadata.xml           | 5 +----
 x11-misc/dmenu/metadata.xml              | 3 ---
 x11-misc/rofi/metadata.xml               | 3 ---
 x11-misc/sent/metadata.xml               | 5 +----
 x11-misc/slock/metadata.xml              | 3 ---
 x11-misc/sprop/metadata.xml              | 5 +----
 x11-misc/sselp/metadata.xml              | 4 ----
 x11-misc/tabbed/metadata.xml             | 4 ----
 x11-misc/vdpauinfo/metadata.xml          | 4 +---
 x11-misc/xidle/metadata.xml              | 5 +----
 x11-misc/xkbset/metadata.xml             | 4 +---
 x11-misc/xowl/metadata.xml               | 6 ++----
 x11-misc/xssstate/metadata.xml           | 4 ----
 x11-terms/lilyterm/metadata.xml          | 3 ---
 x11-terms/rxvt-unicode/metadata.xml      | 5 +----
 x11-terms/st/metadata.xml                | 4 +---
 x11-terms/yeahconsole/metadata.xml       | 5 +----
 x11-wm/aewm/metadata.xml                 | 2 +-
 x11-wm/goomwwm/metadata.xml              | 7 ++-----
 x11-wm/herbstluftwm/metadata.xml         | 4 +---
 x11-wm/musca/metadata.xml                | 5 +----
 x11-wm/pekwm/metadata.xml                | 3 ---
 x11-wm/ratpoison/metadata.xml            | 2 +-
 x11-wm/wmfs/metadata.xml                 | 4 +---
 x11-wm/xoat/metadata.xml                 | 6 ++----
 102 files changed, 97 insertions(+), 366 deletions(-)

diff --git a/app-admin/fam/metadata.xml b/app-admin/fam/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/app-admin/fam/metadata.xml
+++ b/app-admin/fam/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
index 1f15fbbf899..6f49eba8f49 100644
--- a/app-admin/killproc/metadata.xml
+++ b/app-admin/killproc/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">                         
-  <email>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-admin/lib_users/metadata.xml b/app-admin/lib_users/metadata.xml
index 3497f56287b..90fbd3a7307 100644
--- a/app-admin/lib_users/metadata.xml
+++ b/app-admin/lib_users/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>jer@g.o</email>
-    <name>Jeroen Roovers</name>
-  </maintainer>
   <maintainer type="person">
     <email>klausman@g.o</email>
     <name>Tobias Klausman</name>

diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
index 740b2bc5107..9dc442a11c0 100644
--- a/app-admin/whowatch/metadata.xml
+++ b/app-admin/whowatch/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A interactive who program that displays information about the users currently logged into the machine.
 	</longdescription>

diff --git a/app-arch/mt-st/metadata.xml b/app-arch/mt-st/metadata.xml
index 5fa14a0aa1e..ebdcf9258f0 100644
--- a/app-arch/mt-st/metadata.xml
+++ b/app-arch/mt-st/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">iustin/mt-st</remote-id>
 	</upstream>

diff --git a/app-benchmarks/nbench/metadata.xml b/app-benchmarks/nbench/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/app-benchmarks/nbench/metadata.xml
+++ b/app-benchmarks/nbench/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

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

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

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

diff --git a/app-portage/euses/metadata.xml b/app-portage/euses/metadata.xml
index f62a0f06e2e..c6a119862d5 100644
--- a/app-portage/euses/metadata.xml
+++ b/app-portage/euses/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>jer@g.o</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
 <maintainer type="project">
 	<email>tools-portage@g.o</email>
 	<name>Gentoo Portage tools team</name>

diff --git a/app-shells/bashish/metadata.xml b/app-shells/bashish/metadata.xml
index 6d4250d4c68..64e42032473 100644
--- a/app-shells/bashish/metadata.xml
+++ b/app-shells/bashish/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">bashish</remote-id>
 	</upstream>

diff --git a/app-text/an/metadata.xml b/app-text/an/metadata.xml
index f5037f14a3c..6f49eba8f49 100644
--- a/app-text/an/metadata.xml
+++ b/app-text/an/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>jer@g.o</email>
-  <name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
index 96ba5099014..7d709d04f8f 100644
--- a/app-text/diction/metadata.xml
+++ b/app-text/diction/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>jnrowe@×××××.com</email>
 		<name>James Rowe</name>

diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml
index aa1c918e246..268a79f7660 100644
--- a/app-text/jo/metadata.xml
+++ b/app-text/jo/metadata.xml
@@ -1,9 +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>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jpmens/jo</remote-id>
 	</upstream>

diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml
index ece6b81bfbd..7a38bb90096 100644
--- a/app-text/pinfo/metadata.xml
+++ b/app-text/pinfo/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

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

diff --git a/app-text/wscr/metadata.xml b/app-text/wscr/metadata.xml
index d5f156b045c..63ca2d1443d 100644
--- a/app-text/wscr/metadata.xml
+++ b/app-text/wscr/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">WSCR is a program to solve word jumbles, print all
 permutations of a string, and print pseudo-anagrams. It will use /usr/dict/words
 or a user-specified wordlist file</longdescription>

diff --git a/dev-embedded/stm32flash/metadata.xml b/dev-embedded/stm32flash/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/dev-embedded/stm32flash/metadata.xml
+++ b/dev-embedded/stm32flash/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-libs/cl/metadata.xml b/dev-libs/cl/metadata.xml
index b2f11e650c2..f60477966bf 100644
--- a/dev-libs/cl/metadata.xml
+++ b/dev-libs/cl/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">tonyrog/cl</remote-id>
 	</upstream>

diff --git a/dev-libs/dmalloc/metadata.xml b/dev-libs/dmalloc/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/dev-libs/dmalloc/metadata.xml
+++ b/dev-libs/dmalloc/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index 78451ccf130..4edaaa5f9fa 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 <remote-id type="cpe">cpe:/a:niels_provos:libevent</remote-id>
 <remote-id type="github">libevent/libevent</remote-id>

diff --git a/dev-libs/liblinear/metadata.xml b/dev-libs/liblinear/metadata.xml
index 97b5450a7dc..eed2a582d76 100644
--- a/dev-libs/liblinear/metadata.xml
+++ b/dev-libs/liblinear/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>jer@g.o</email>
-    <name>Jeroen Roovers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">cjlin1/liblinear</remote-id>
   </upstream>

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

diff --git a/dev-libs/libuv/metadata.xml b/dev-libs/libuv/metadata.xml
index 125e4a56507..79d3a05ac5a 100644
--- a/dev-libs/libuv/metadata.xml
+++ b/dev-libs/libuv/metadata.xml
@@ -5,9 +5,6 @@
 		<email>kde@g.o</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>jer@g.o</email>
-	</maintainer>
 	<longdescription lang="en">
 		libuv is a platform layer for node.js. Its purpose is to abstract
 		IOCP on Windows and epoll/kqueue/event ports/etc. on Unix systems.

diff --git a/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/dev-util/complexity/metadata.xml
+++ b/dev-util/complexity/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-util/cppi/metadata.xml b/dev-util/cppi/metadata.xml
index f9f8bbfd940..6f49eba8f49 100644
--- a/dev-util/cppi/metadata.xml
+++ b/dev-util/cppi/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>jer@g.o</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

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

diff --git a/dev-util/indent/metadata.xml b/dev-util/indent/metadata.xml
index f9f8bbfd940..6f49eba8f49 100644
--- a/dev-util/indent/metadata.xml
+++ b/dev-util/indent/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>jer@g.o</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

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

diff --git a/dev-util/rej/metadata.xml b/dev-util/rej/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/dev-util/rej/metadata.xml
+++ b/dev-util/rej/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-util/splint/metadata.xml b/dev-util/splint/metadata.xml
index f9f8bbfd940..6f49eba8f49 100644
--- a/dev-util/splint/metadata.xml
+++ b/dev-util/splint/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>jer@g.o</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/dev-vcs/cssc/metadata.xml b/dev-vcs/cssc/metadata.xml
index dd7b8493d1b..85b535a15fa 100644
--- a/dev-vcs/cssc/metadata.xml
+++ b/dev-vcs/cssc/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in tests</flag>
 </use>

diff --git a/media-gfx/farbfeld/metadata.xml b/media-gfx/farbfeld/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/media-gfx/farbfeld/metadata.xml
+++ b/media-gfx/farbfeld/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 0959fcdd115..e7dd09135be 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
 <flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag>

diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index e61730462a7..5ae50d4b1ee 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type='person'><email>jer@g.o</email></maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag>
-<flag name='heif'>Use <pkg>media-libs/libheif</pkg> as image library</flag>
-<flag name='libnsgif'>Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
+<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> as image library</flag>
+<flag name="heif">Use <pkg>media-libs/libheif</pkg> as image library</flag>
+<flag name="libnsgif">Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
 </use>
 <upstream>
 <remote-id type="github">eXeC64/imv</remote-id>

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

diff --git a/media-gfx/wings/metadata.xml b/media-gfx/wings/metadata.xml
index eca4d413b35..2490feb795e 100644
--- a/media-gfx/wings/metadata.xml
+++ b/media-gfx/wings/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>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 Wings 3D is a polygon mesh modeler inspired by Nendo and 
 Mirai from Izware.

diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index bc38f174607..44c34e3b421 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/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>jer@g.o</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>sound@g.o</email>
 		<name>Gentoo Sound project</name>

diff --git a/media-video/blind/metadata.xml b/media-video/blind/metadata.xml
index 5ba62861f1c..6f49eba8f49 100644
--- a/media-video/blind/metadata.xml
+++ b/media-video/blind/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml
index 65f179266d1..2c2a7923cfc 100644
--- a/net-analyzer/dhcp_probe/metadata.xml
+++ b/net-analyzer/dhcp_probe/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@g.o</email>
 		<name>Gentoo network monitoring and analysis project</name>

diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml
index ac8cfae30ff..2c2a7923cfc 100644
--- a/net-analyzer/ifstat/metadata.xml
+++ b/net-analyzer/ifstat/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>jer@g.o</email>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@g.o</email>
 		<name>Gentoo network monitoring and analysis project</name>

diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml
index dec13966250..9c86a3d2d05 100644
--- a/net-analyzer/odhcploc/metadata.xml
+++ b/net-analyzer/odhcploc/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>netmon@g.o</email>
 		<name>Gentoo network monitoring and analysis project</name>

diff --git a/net-dialup/wvdial/metadata.xml b/net-dialup/wvdial/metadata.xml
index 0d0a7d6c0c4..061abe7fe3d 100644
--- a/net-dialup/wvdial/metadata.xml
+++ b/net-dialup/wvdial/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">wvstreams</remote-id>
 	</upstream>

diff --git a/net-dns/idnkit/metadata.xml b/net-dns/idnkit/metadata.xml
index 568bd4ccbd6..7fd8a766eda 100644
--- a/net-dns/idnkit/metadata.xml
+++ b/net-dns/idnkit/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="liteonly">Compile and install lite library only</flag>
 </use>

diff --git a/net-dns/libidn/metadata.xml b/net-dns/libidn/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/net-dns/libidn/metadata.xml
+++ b/net-dns/libidn/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-dns/libidn2/metadata.xml b/net-dns/libidn2/metadata.xml
index 87360eddc9b..3de7846dc19 100644
--- a/net-dns/libidn2/metadata.xml
+++ b/net-dns/libidn2/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 <remote-id type="cpe">cpe:/a:libidn2_project:libidn2</remote-id>
 </upstream>

diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
index 1c23e9e44b2..779ee124409 100644
--- a/net-ftp/lftp/metadata.xml
+++ b/net-ftp/lftp/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>jer@g.o</email>
-  <name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
 <flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>

diff --git a/net-ftp/ncftp/metadata.xml b/net-ftp/ncftp/metadata.xml
index ea305f5d25b..8d4445c39ea 100644
--- a/net-ftp/ncftp/metadata.xml
+++ b/net-ftp/ncftp/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>jer@g.o</email>
-  <name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 NcFTP Client (also known as just NcFTP) is a set of FREE application 
 programs implementing the File Transfer Protocol (FTP).

diff --git a/net-libs/http-parser/metadata.xml b/net-libs/http-parser/metadata.xml
index 390b89b4f04..4cf4a4e9d92 100644
--- a/net-libs/http-parser/metadata.xml
+++ b/net-libs/http-parser/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <upstream>
 <remote-id type="github">nodejs/http-parser</remote-id>
 </upstream>

diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 3e9bb1da9c0..550cda59b44 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/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>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="inspector">Enable V8 inspector</flag>
 		<flag name="npm">Enable NPM package manager</flag>

diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index bc7e4818799..d49958fba1e 100644
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
   <upstream>
     <remote-id type="google-code">wvstreams</remote-id>
   </upstream>

diff --git a/net-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index 88aef130435..392d66d056c 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-ng/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
 <maintainer type="project">
 <email>deb-tools@g.o</email>
 <name>Gentoo Debian Tools Project</name>

diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 9b7e225c3ad..97ba0877980 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
 the accuracy of the system clock on a computer. chronyd has been specifically

diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml
index 05b0733a9e7..1160ae25593 100644
--- a/net-misc/olsrd/metadata.xml
+++ b/net-misc/olsrd/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name='pud'>Install the Node Position Update plugin</flag>
+<flag name="pud">Install the Node Position Update plugin</flag>
 </use>
 </pkgmetadata>

diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index 6f7ffaa0c97..bc1f2eab89b 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">
 PuTTY is a free implementation of Telnet and SSH for Windows and Unix
 platforms, along with an xterm terminal emulator. It supports flexible terminal

diff --git a/net-misc/whatmask/metadata.xml b/net-misc/whatmask/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/net-misc/whatmask/metadata.xml
+++ b/net-misc/whatmask/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/net-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml
index 6a4728cab75..1b2becffa26 100644
--- a/net-misc/youtube-dl/metadata.xml
+++ b/net-misc/youtube-dl/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jer@g.o</email>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sci-calculators/datamash/metadata.xml b/sci-calculators/datamash/metadata.xml
index e792eaf68c5..546a299ef9e 100644
--- a/sci-calculators/datamash/metadata.xml
+++ b/sci-calculators/datamash/metadata.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
-<flag name='linux-crypto'>Use Linux kernel cryptographic API</flag>
-<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
+<flag name="linux-crypto">Use Linux kernel cryptographic API</flag>
+<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index b411ce91602..fc2b9059d66 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="units-cur">Install the units_cur python script that updates currencies</flag>
 </use>

diff --git a/sys-apps/pv/metadata.xml b/sys-apps/pv/metadata.xml
index b9de93a595e..b7b1cdbb94d 100644
--- a/sys-apps/pv/metadata.xml
+++ b/sys-apps/pv/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>jer@g.o</email>
-    <name>Jeroen Roovers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="google-code">pipeviewer</remote-id>
   </upstream>

diff --git a/sys-block/viaideinfo/metadata.xml b/sys-block/viaideinfo/metadata.xml
index f9f8bbfd940..6f49eba8f49 100644
--- a/sys-block/viaideinfo/metadata.xml
+++ b/sys-block/viaideinfo/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>jer@g.o</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-boot/unetbootin/metadata.xml b/sys-boot/unetbootin/metadata.xml
index 91ac6550733..191fd609ce6 100644
--- a/sys-boot/unetbootin/metadata.xml
+++ b/sys-boot/unetbootin/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">unetbootin</remote-id>
 		<remote-id type="github">unetbootin/unetbootin</remote-id>

diff --git a/sys-fs/fatresize/metadata.xml b/sys-fs/fatresize/metadata.xml
index 5ba62861f1c..6f49eba8f49 100644
--- a/sys-fs/fatresize/metadata.xml
+++ b/sys-fs/fatresize/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/sys-fs/jmtpfs/metadata.xml b/sys-fs/jmtpfs/metadata.xml
index f268713ff9a..fc467e691ea 100644
--- a/sys-fs/jmtpfs/metadata.xml
+++ b/sys-fs/jmtpfs/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>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">JasonFerrara/jmtpfs</remote-id>
 	</upstream>

diff --git a/sys-power/powernowd/metadata.xml b/sys-power/powernowd/metadata.xml
index 221a755312d..1cb3d376d4a 100644
--- a/sys-power/powernowd/metadata.xml
+++ b/sys-power/powernowd/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>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">clemej/powernowd</remote-id>
 	</upstream>

diff --git a/www-client/opera-beta/metadata.xml b/www-client/opera-beta/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/www-client/opera-beta/metadata.xml
+++ b/www-client/opera-beta/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/www-client/opera-developer/metadata.xml b/www-client/opera-developer/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/www-client/opera-developer/metadata.xml
+++ b/www-client/opera-developer/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 2ac7edc2a6f..677f013b705 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 Opera is a graphical Web browser available on several platforms. The desktop
 version runs on GNU/Linux and FreeBSD. Versions for Macintosh and

diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml
index 2fe0e982fcf..e4355101232 100644
--- a/www-client/otter/metadata.xml
+++ b/www-client/otter/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> as backend instead of <pkg>dev-qt/qtwebkit</pkg> (experimental)</flag>
 </use>

diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index 4a8cfc931d2..5e4c14c17c0 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
 </use>

diff --git a/www-client/surfraw/metadata.xml b/www-client/surfraw/metadata.xml
index d3c7c07059f..d8926e49ecc 100644
--- a/www-client/surfraw/metadata.xml
+++ b/www-client/surfraw/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>jnrowe@×××××.com</email>
 		<name>James Rowe</name>

diff --git a/www-client/vivaldi-snapshot/metadata.xml b/www-client/vivaldi-snapshot/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/www-client/vivaldi-snapshot/metadata.xml
+++ b/www-client/vivaldi-snapshot/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/www-client/vivaldi/metadata.xml
+++ b/www-client/vivaldi/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index e3e8fa04213..359704f0a19 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/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>jer@g.o</email>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@g.o</email>
 <name>Gentoo Desktop Miscellaneous Project</name>

diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index 4bdb2f83abc..aef85f4bdfd 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription>
 Nvidia provides different branches of its drivers for different batches of its
 hardware. When maintaining these ebuilds or other ebuilds depending on them,

diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
index f8bd6f3f34f..7a38bb90096 100644
--- a/x11-libs/libvdpau/metadata.xml
+++ b/x11-libs/libvdpau/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
index b4a38aa7262..bc1b97e1eb7 100644
--- a/x11-misc/dmenu/metadata.xml
+++ b/x11-misc/dmenu/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>jer@g.o</email>
-  </maintainer>
   <maintainer type="project">
     <email>desktop-misc@g.o</email>
     <name>Gentoo Desktop Miscellaneous Project</name>

diff --git a/x11-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index 55134acf088..a9c1853eed4 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/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>jer@g.o</email>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@g.o</email>
 <name>Gentoo Desktop Miscellaneous Project</name>

diff --git a/x11-misc/sent/metadata.xml b/x11-misc/sent/metadata.xml
index 87b4ee7d710..0c4c3b2f008 100644
--- a/x11-misc/sent/metadata.xml
+++ b/x11-misc/sent/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag>
 </use>

diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml
index 807835d750e..814e8b81bc5 100644
--- a/x11-misc/slock/metadata.xml
+++ b/x11-misc/slock/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>jer@g.o</email>
-</maintainer>
 <maintainer type="project">
   <email>desktop-misc@g.o</email>
   <name>Gentoo Desktop Miscellaneous Project</name>

diff --git a/x11-misc/sprop/metadata.xml b/x11-misc/sprop/metadata.xml
index a8fb4331294..6f49eba8f49 100644
--- a/x11-misc/sprop/metadata.xml
+++ b/x11-misc/sprop/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml
index 229dd61feac..7f81a451ce1 100644
--- a/x11-misc/sselp/metadata.xml
+++ b/x11-misc/sselp/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@g.o</email>
 <name>Gentoo Desktop Miscellaneous Project</name>

diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml
index 229dd61feac..7f81a451ce1 100644
--- a/x11-misc/tabbed/metadata.xml
+++ b/x11-misc/tabbed/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@g.o</email>
 <name>Gentoo Desktop Miscellaneous Project</name>

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

diff --git a/x11-misc/xidle/metadata.xml b/x11-misc/xidle/metadata.xml
index f9f8bbfd940..6f49eba8f49 100644
--- a/x11-misc/xidle/metadata.xml
+++ b/x11-misc/xidle/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>jer@g.o</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-misc/xkbset/metadata.xml b/x11-misc/xkbset/metadata.xml
index 9cd3e998881..778120dc801 100644
--- a/x11-misc/xkbset/metadata.xml
+++ b/x11-misc/xkbset/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="tk">Install the <pkg>dev-perl/Tk</pkg> based xkbset-gui utility</flag>
 </use>

diff --git a/x11-misc/xowl/metadata.xml b/x11-misc/xowl/metadata.xml
index c39cdaf110e..a9528a673a3 100644
--- a/x11-misc/xowl/metadata.xml
+++ b/x11-misc/xowl/metadata.xml
@@ -1,9 +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>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/xowl</remote-id>
 	</upstream>

diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml
index 229dd61feac..7f81a451ce1 100644
--- a/x11-misc/xssstate/metadata.xml
+++ b/x11-misc/xssstate/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@g.o</email>
 <name>Gentoo Desktop Miscellaneous Project</name>

diff --git a/x11-terms/lilyterm/metadata.xml b/x11-terms/lilyterm/metadata.xml
index 5cbd11fe1bc..7f81a451ce1 100644
--- a/x11-terms/lilyterm/metadata.xml
+++ b/x11-terms/lilyterm/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>jer@g.o</email>
-</maintainer>
 <maintainer type="project">
 <email>desktop-misc@g.o</email>
 <name>Gentoo Desktop Miscellaneous Project</name>

diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
index d350fb5c5bd..4915b2ce204 100644
--- a/x11-terms/rxvt-unicode/metadata.xml
+++ b/x11-terms/rxvt-unicode/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>jer@g.o</email>
-<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="256-color">Enable 256 color support</flag>
 <flag name="blink">Enable blinking text</flag>

diff --git a/x11-terms/st/metadata.xml b/x11-terms/st/metadata.xml
index 5ba62861f1c..6f49eba8f49 100644
--- a/x11-terms/st/metadata.xml
+++ b/x11-terms/st/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-terms/yeahconsole/metadata.xml b/x11-terms/yeahconsole/metadata.xml
index f9f8bbfd940..6f49eba8f49 100644
--- a/x11-terms/yeahconsole/metadata.xml
+++ b/x11-terms/yeahconsole/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>jer@g.o</email>
-	<name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>

diff --git a/x11-wm/aewm/metadata.xml b/x11-wm/aewm/metadata.xml
index abd9614c9fc..0d6c64592c1 100644
--- a/x11-wm/aewm/metadata.xml
+++ b/x11-wm/aewm/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>jer@g.o</email></maintainer>
+<!-- maintainer-needed -->
 	<longdescription>
 	aewm is a minimalist window manager for X11. It has no nifty features, 
 	but is light on resources and extremely simple in appearance. It should 

diff --git a/x11-wm/goomwwm/metadata.xml b/x11-wm/goomwwm/metadata.xml
index c4b90b2e86c..ccf33057822 100644
--- a/x11-wm/goomwwm/metadata.xml
+++ b/x11-wm/goomwwm/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/goomwwm</remote-id>
 	</upstream>

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

diff --git a/x11-wm/musca/metadata.xml b/x11-wm/musca/metadata.xml
index 4b518dbe641..e2841a52568 100644
--- a/x11-wm/musca/metadata.xml
+++ b/x11-wm/musca/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>jer@g.o</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="apis">Optionally install the experimental `apis' window manager</flag>
 		<flag name="xlisten">Optionally install the xlisten utility</flag>

diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index 5d97b5bb7de..2b003ee6b95 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/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>jer@g.o</email>
-	</maintainer>
 	<maintainer type="person">
 		<email>linbug+gbz@××××××.org</email>
 		<name>Andreas Schlick</name>

diff --git a/x11-wm/ratpoison/metadata.xml b/x11-wm/ratpoison/metadata.xml
index 00627b34957..c1ffdeb3c89 100644
--- a/x11-wm/ratpoison/metadata.xml
+++ b/x11-wm/ratpoison/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person"><email>jer@g.o</email></maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Ratpoison is a simple Window Manager with no fat library dependencies,
 		no fancy graphics, no window decorations, and no rodent dependence. It

diff --git a/x11-wm/wmfs/metadata.xml b/x11-wm/wmfs/metadata.xml
index 5938d928ad7..498c6454722 100644
--- a/x11-wm/wmfs/metadata.xml
+++ b/x11-wm/wmfs/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>jer@g.o</email>
-</maintainer>
+<!-- maintainer-needed -->
 <use>
 <flag name="imlib2">Enable image support through <pkg>media-libs/imlib2</pkg></flag>
 </use>

diff --git a/x11-wm/xoat/metadata.xml b/x11-wm/xoat/metadata.xml
index cb3714e2407..8ba31104257 100644
--- a/x11-wm/xoat/metadata.xml
+++ b/x11-wm/xoat/metadata.xml
@@ -1,9 +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>jer@g.o</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">seanpringle/xoat</remote-id>
 	</upstream>