18 files changed, 16 insertions, 72 deletions
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@gentoo.org</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@gentoo.org</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@gentoo.org</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@gentoo.org</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@gentoo.org</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@gentoo.org</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@gentoo.org</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@gentoo.org</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@gentoo.org</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
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
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@gentoo.org</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@gentoo.org</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@gentoo.org</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@gentoo.org</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
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
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@gentoo.org</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@gentoo.org</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@gentoo.org</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.