summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/2ping/metadata.xml2
-rw-r--r--net-analyzer/aimsniff/metadata.xml2
-rw-r--r--net-analyzer/alive/metadata.xml2
-rw-r--r--net-analyzer/amap/metadata.xml2
-rw-r--r--net-analyzer/angst/metadata.xml2
-rw-r--r--net-analyzer/apinger/metadata.xml2
-rw-r--r--net-analyzer/argus-clients/metadata.xml2
-rw-r--r--net-analyzer/argus/metadata.xml2
-rw-r--r--net-analyzer/arp-scan/metadata.xml2
-rw-r--r--net-analyzer/arp-sk/metadata.xml2
-rw-r--r--net-analyzer/arping/metadata.xml2
-rw-r--r--net-analyzer/arpoison/metadata.xml2
-rw-r--r--net-analyzer/arpon/metadata.xml2
-rw-r--r--net-analyzer/arptools/metadata.xml4
-rw-r--r--net-analyzer/arpwatch/metadata.xml2
-rw-r--r--net-analyzer/barnyard/metadata.xml2
-rw-r--r--net-analyzer/barnyard2/metadata.xml8
-rw-r--r--net-analyzer/bigeye/metadata.xml2
-rw-r--r--net-analyzer/bing/metadata.xml2
-rw-r--r--net-analyzer/bmon/metadata.xml2
-rw-r--r--net-analyzer/braa/metadata.xml2
-rw-r--r--net-analyzer/bsnmp/metadata.xml2
-rw-r--r--net-analyzer/bwbar/metadata.xml2
-rw-r--r--net-analyzer/bwmon/metadata.xml2
-rw-r--r--net-analyzer/bwping/metadata.xml4
-rw-r--r--net-analyzer/cacti-spine/metadata.xml2
-rw-r--r--net-analyzer/cacti/metadata.xml2
-rw-r--r--net-analyzer/calamaris/metadata.xml2
-rw-r--r--net-analyzer/carl/metadata.xml4
-rw-r--r--net-analyzer/cbm/metadata.xml4
-rw-r--r--net-analyzer/chaosreader/metadata.xml4
-rw-r--r--net-analyzer/check_mk/metadata.xml4
-rw-r--r--net-analyzer/cloudshark/metadata.xml2
-rw-r--r--net-analyzer/cnet/metadata.xml2
-rw-r--r--net-analyzer/cryptcat/metadata.xml2
-rw-r--r--net-analyzer/cutter/metadata.xml2
-rw-r--r--net-analyzer/darkstat/metadata.xml2
-rw-r--r--net-analyzer/dhcp_probe/metadata.xml4
-rw-r--r--net-analyzer/dhcpdump/metadata.xml2
-rw-r--r--net-analyzer/dietsniff/metadata.xml2
-rw-r--r--net-analyzer/dnsenum/metadata.xml2
-rw-r--r--net-analyzer/dnstracer/metadata.xml2
-rw-r--r--net-analyzer/dosdetector/metadata.xml2
-rw-r--r--net-analyzer/driftnet/metadata.xml2
-rw-r--r--net-analyzer/dsniff/metadata.xml2
-rw-r--r--net-analyzer/echoping/metadata.xml2
-rw-r--r--net-analyzer/egressor/metadata.xml2
-rw-r--r--net-analyzer/etherape/metadata.xml2
-rw-r--r--net-analyzer/ethloop/metadata.xml2
-rw-r--r--net-analyzer/ettercap/metadata.xml6
-rw-r--r--net-analyzer/fail2ban/metadata.xml2
-rw-r--r--net-analyzer/fe3d/metadata.xml2
-rw-r--r--net-analyzer/ffp/metadata.xml2
-rw-r--r--net-analyzer/firewalk/metadata.xml2
-rw-r--r--net-analyzer/flow-tools/metadata.xml2
-rw-r--r--net-analyzer/flowgrind/metadata.xml2
-rw-r--r--net-analyzer/fping/metadata.xml2
-rw-r--r--net-analyzer/fprobe/metadata.xml2
-rw-r--r--net-analyzer/fragroute/metadata.xml2
-rw-r--r--net-analyzer/ftester/metadata.xml2
-rw-r--r--net-analyzer/fwlogwatch/metadata.xml2
-rw-r--r--net-analyzer/gensink/metadata.xml2
-rw-r--r--net-analyzer/gnome-nettool/metadata.xml2
-rw-r--r--net-analyzer/gnu-netcat/metadata.xml2
-rw-r--r--net-analyzer/goaccess/metadata.xml4
-rw-r--r--net-analyzer/gr-fosphor/metadata.xml2
-rw-r--r--net-analyzer/graphite-web/metadata.xml2
-rw-r--r--net-analyzer/greenbone-security-assistant/metadata.xml2
-rw-r--r--net-analyzer/gsm-receiver/metadata.xml2
-rw-r--r--net-analyzer/hping/metadata.xml2
-rw-r--r--net-analyzer/httping/metadata.xml2
-rw-r--r--net-analyzer/hunt/metadata.xml2
-rw-r--r--net-analyzer/hydra/metadata.xml2
-rw-r--r--net-analyzer/ibmonitor/metadata.xml2
-rw-r--r--net-analyzer/icinga-web/metadata.xml2
-rw-r--r--net-analyzer/icinga/metadata.xml2
-rw-r--r--net-analyzer/icinga2/metadata.xml2
-rw-r--r--net-analyzer/ifmetric/metadata.xml2
-rw-r--r--net-analyzer/ifstat/metadata.xml4
-rw-r--r--net-analyzer/ifstatus/metadata.xml2
-rw-r--r--net-analyzer/iftop/metadata.xml2
-rw-r--r--net-analyzer/ike-scan/metadata.xml2
-rw-r--r--net-analyzer/ipaudit/metadata.xml2
-rw-r--r--net-analyzer/ipband/metadata.xml2
-rw-r--r--net-analyzer/ipcad/metadata.xml2
-rw-r--r--net-analyzer/ipgen/metadata.xml2
-rw-r--r--net-analyzer/ipguard/metadata.xml2
-rw-r--r--net-analyzer/iplog/metadata.xml2
-rw-r--r--net-analyzer/ippl/metadata.xml2
-rw-r--r--net-analyzer/iptraf-ng/metadata.xml2
-rw-r--r--net-analyzer/iptstate/metadata.xml2
-rw-r--r--net-analyzer/ipv6-toolkit/metadata.xml2
-rw-r--r--net-analyzer/isic/metadata.xml2
-rw-r--r--net-analyzer/jffnms/metadata.xml2
-rw-r--r--net-analyzer/jmx2munin/metadata.xml4
-rw-r--r--net-analyzer/jnettop/metadata.xml2
-rw-r--r--net-analyzer/knocker/metadata.xml2
-rw-r--r--net-analyzer/labrea/metadata.xml2
-rw-r--r--net-analyzer/lft/metadata.xml2
-rw-r--r--net-analyzer/libnasl/metadata.xml2
-rw-r--r--net-analyzer/lilac/metadata.xml2
-rw-r--r--net-analyzer/linkchecker/metadata.xml2
-rw-r--r--net-analyzer/macchanger/metadata.xml4
-rw-r--r--net-analyzer/masscan/metadata.xml4
-rw-r--r--net-analyzer/mate-netspeed/metadata.xml2
-rw-r--r--net-analyzer/mbrowse/metadata.xml2
-rw-r--r--net-analyzer/metasploit/metadata.xml2
-rw-r--r--net-analyzer/monitoring-plugins/metadata.xml6
-rw-r--r--net-analyzer/mping/metadata.xml2
-rw-r--r--net-analyzer/mrtg-ping-probe/metadata.xml2
-rw-r--r--net-analyzer/mrtg/metadata.xml2
-rw-r--r--net-analyzer/mtr/metadata.xml2
-rw-r--r--net-analyzer/multimon-ng/metadata.xml4
-rw-r--r--net-analyzer/munin/metadata.xml2
-rw-r--r--net-analyzer/nagios-check_dnssec/metadata.xml8
-rw-r--r--net-analyzer/nagios-check_fail2ban/metadata.xml6
-rw-r--r--net-analyzer/nagios-check_glsa2/metadata.xml8
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/metadata.xml8
-rw-r--r--net-analyzer/nagios-check_linux_bonding/metadata.xml2
-rw-r--r--net-analyzer/nagios-check_logfiles/metadata.xml10
-rw-r--r--net-analyzer/nagios-check_mysql_health/metadata.xml8
-rw-r--r--net-analyzer/nagios-check_openvpn-simple/metadata.xml2
-rw-r--r--net-analyzer/nagios-check_pidfile/metadata.xml6
-rw-r--r--net-analyzer/nagios-check_rbl/metadata.xml10
-rw-r--r--net-analyzer/nagios-core/metadata.xml10
-rw-r--r--net-analyzer/nagios-plugins-flameeyes/metadata.xml4
-rw-r--r--net-analyzer/nagios-plugins-snmp/metadata.xml8
-rw-r--r--net-analyzer/nagios-plugins/metadata.xml10
-rw-r--r--net-analyzer/nagios-sap-ccms-plugin/metadata.xml8
-rw-r--r--net-analyzer/nagios/metadata.xml10
-rw-r--r--net-analyzer/nagircbot/metadata.xml2
-rw-r--r--net-analyzer/nagstamon/metadata.xml4
-rw-r--r--net-analyzer/namebench/metadata.xml2
-rw-r--r--net-analyzer/nast/metadata.xml2
-rw-r--r--net-analyzer/nbtscan/metadata.xml2
-rw-r--r--net-analyzer/nbwmon/metadata.xml2
-rw-r--r--net-analyzer/ncrack/metadata.xml2
-rw-r--r--net-analyzer/ndoutils/metadata.xml2
-rw-r--r--net-analyzer/ndsad/metadata.xml2
-rw-r--r--net-analyzer/nepenthes/metadata.xml2
-rw-r--r--net-analyzer/nessus-bin/metadata.xml2
-rw-r--r--net-analyzer/nessus-client/metadata.xml2
-rw-r--r--net-analyzer/nessus-core/metadata.xml2
-rw-r--r--net-analyzer/nessus-libraries/metadata.xml2
-rw-r--r--net-analyzer/nessus-plugins/metadata.xml2
-rw-r--r--net-analyzer/nessus/metadata.xml2
-rw-r--r--net-analyzer/net-snmp/metadata.xml2
-rw-r--r--net-analyzer/netcat/metadata.xml4
-rw-r--r--net-analyzer/netcat6/metadata.xml2
-rw-r--r--net-analyzer/netdiscover/metadata.xml2
-rw-r--r--net-analyzer/nethogs/metadata.xml2
-rw-r--r--net-analyzer/neti/metadata.xml2
-rw-r--r--net-analyzer/netio/metadata.xml2
-rw-r--r--net-analyzer/netperf/metadata.xml2
-rw-r--r--net-analyzer/netselect/metadata.xml2
-rw-r--r--net-analyzer/netsniff-ng/metadata.xml2
-rw-r--r--net-analyzer/nettop/metadata.xml2
-rw-r--r--net-analyzer/netwag/metadata.xml2
-rw-r--r--net-analyzer/netwatch/metadata.xml4
-rw-r--r--net-analyzer/netwox/metadata.xml2
-rw-r--r--net-analyzer/nfdump/metadata.xml2
-rw-r--r--net-analyzer/ngrep/metadata.xml6
-rw-r--r--net-analyzer/nipper/metadata.xml2
-rw-r--r--net-analyzer/nload/metadata.xml2
-rw-r--r--net-analyzer/nmap/metadata.xml2
-rw-r--r--net-analyzer/nmapsi/metadata.xml2
-rw-r--r--net-analyzer/nodebrain/metadata.xml2
-rw-r--r--net-analyzer/nrpe/metadata.xml2
-rw-r--r--net-analyzer/nsat/metadata.xml2
-rw-r--r--net-analyzer/nsca/metadata.xml2
-rw-r--r--net-analyzer/nstats/metadata.xml2
-rw-r--r--net-analyzer/ntop/metadata.xml2
-rw-r--r--net-analyzer/ntopng/metadata.xml2
-rw-r--r--net-analyzer/nttcp/metadata.xml2
-rw-r--r--net-analyzer/odhcploc/metadata.xml4
-rw-r--r--net-analyzer/oinkmaster/metadata.xml2
-rw-r--r--net-analyzer/openbsd-netcat/metadata.xml2
-rw-r--r--net-analyzer/openvas-cli/metadata.xml2
-rw-r--r--net-analyzer/openvas-libraries/metadata.xml2
-rw-r--r--net-analyzer/openvas-manager/metadata.xml2
-rw-r--r--net-analyzer/openvas-scanner/metadata.xml2
-rw-r--r--net-analyzer/openvas-tools/metadata.xml2
-rw-r--r--net-analyzer/openvas/metadata.xml2
-rw-r--r--net-analyzer/ospd/metadata.xml2
-rw-r--r--net-analyzer/ostinato/metadata.xml2
-rw-r--r--net-analyzer/p0f/metadata.xml2
-rw-r--r--net-analyzer/packit/metadata.xml2
-rw-r--r--net-analyzer/pathload/metadata.xml2
-rw-r--r--net-analyzer/pbnj/metadata.xml6
-rw-r--r--net-analyzer/pchar/metadata.xml2
-rw-r--r--net-analyzer/pinger/metadata.xml2
-rw-r--r--net-analyzer/pktstat/metadata.xml2
-rw-r--r--net-analyzer/pmacct/metadata.xml2
-rw-r--r--net-analyzer/pnp4nagios/metadata.xml2
-rw-r--r--net-analyzer/poink/metadata.xml2
-rw-r--r--net-analyzer/portmon/metadata.xml2
-rw-r--r--net-analyzer/portsentry/metadata.xml2
-rw-r--r--net-analyzer/postal/metadata.xml2
-rw-r--r--net-analyzer/pypacker/metadata.xml2
-rw-r--r--net-analyzer/quidscor/metadata.xml2
-rw-r--r--net-analyzer/raddump/metadata.xml2
-rw-r--r--net-analyzer/rain/metadata.xml2
-rw-r--r--net-analyzer/ripe-atlas-tools/metadata.xml4
-rw-r--r--net-analyzer/rrdcollect/metadata.xml2
-rw-r--r--net-analyzer/rrdtool/metadata.xml2
-rw-r--r--net-analyzer/sancp/metadata.xml2
-rw-r--r--net-analyzer/sarg/metadata.xml2
-rw-r--r--net-analyzer/sbd/metadata.xml2
-rw-r--r--net-analyzer/scanlogd/metadata.xml2
-rw-r--r--net-analyzer/scanssh/metadata.xml2
-rw-r--r--net-analyzer/scapy/metadata.xml4
-rw-r--r--net-analyzer/scli/metadata.xml2
-rw-r--r--net-analyzer/sec/metadata.xml2
-rw-r--r--net-analyzer/sflowtool/metadata.xml2
-rw-r--r--net-analyzer/sguil-client/metadata.xml2
-rw-r--r--net-analyzer/sguil-sensor/metadata.xml2
-rw-r--r--net-analyzer/sguil-server/metadata.xml2
-rw-r--r--net-analyzer/sinfo/metadata.xml2
-rw-r--r--net-analyzer/siphon/metadata.xml2
-rw-r--r--net-analyzer/slurm/metadata.xml2
-rw-r--r--net-analyzer/smokeping/metadata.xml2
-rw-r--r--net-analyzer/sniffit/metadata.xml2
-rw-r--r--net-analyzer/snips/metadata.xml2
-rw-r--r--net-analyzer/snmptt/metadata.xml2
-rw-r--r--net-analyzer/snort/metadata.xml8
-rw-r--r--net-analyzer/snortalog/metadata.xml2
-rw-r--r--net-analyzer/snortsam/metadata.xml2
-rw-r--r--net-analyzer/softflowd/metadata.xml2
-rw-r--r--net-analyzer/speedtest-cli/metadata.xml2
-rw-r--r--net-analyzer/sqlninja/metadata.xml4
-rw-r--r--net-analyzer/squid-graph/metadata.xml2
-rw-r--r--net-analyzer/squidsites/metadata.xml2
-rw-r--r--net-analyzer/ssldump/metadata.xml2
-rw-r--r--net-analyzer/sslscan/metadata.xml2
-rw-r--r--net-analyzer/sslsniff/metadata.xml6
-rw-r--r--net-analyzer/ssmping/metadata.xml6
-rw-r--r--net-analyzer/suricata/metadata.xml2
-rw-r--r--net-analyzer/symon/metadata.xml2
-rw-r--r--net-analyzer/synscan/metadata.xml2
-rw-r--r--net-analyzer/syweb/metadata.xml2
-rw-r--r--net-analyzer/tcpdump/metadata.xml2
-rw-r--r--net-analyzer/tcpflow/metadata.xml2
-rw-r--r--net-analyzer/tcping/metadata.xml2
-rw-r--r--net-analyzer/tcpreen/metadata.xml2
-rw-r--r--net-analyzer/tcpreplay/metadata.xml2
-rw-r--r--net-analyzer/tcpslice/metadata.xml2
-rw-r--r--net-analyzer/tcpstat/metadata.xml2
-rw-r--r--net-analyzer/tcptrace/metadata.xml2
-rw-r--r--net-analyzer/tcptraceroute/metadata.xml2
-rw-r--r--net-analyzer/tcptrack/metadata.xml2
-rw-r--r--net-analyzer/testssl/metadata.xml2
-rw-r--r--net-analyzer/thc-ipv6/metadata.xml2
-rw-r--r--net-analyzer/thcrut/metadata.xml2
-rw-r--r--net-analyzer/thrulay/metadata.xml2
-rw-r--r--net-analyzer/tleds/metadata.xml2
-rw-r--r--net-analyzer/tptest/metadata.xml2
-rw-r--r--net-analyzer/tracebox/metadata.xml2
-rw-r--r--net-analyzer/traceproto/metadata.xml2
-rw-r--r--net-analyzer/traceroute-nanog/metadata.xml2
-rw-r--r--net-analyzer/traceroute/metadata.xml2
-rw-r--r--net-analyzer/trafshow/metadata.xml2
-rw-r--r--net-analyzer/tsung/metadata.xml2
-rw-r--r--net-analyzer/ttcp/metadata.xml2
-rw-r--r--net-analyzer/upnpscan/metadata.xml2
-rw-r--r--net-analyzer/vnstat/metadata.xml2
-rw-r--r--net-analyzer/w3af/metadata.xml4
-rw-r--r--net-analyzer/wapiti/metadata.xml2
-rw-r--r--net-analyzer/webfuzzer/metadata.xml2
-rw-r--r--net-analyzer/wireshark/metadata.xml2
-rw-r--r--net-analyzer/xnetload/metadata.xml2
-rw-r--r--net-analyzer/xprobe/metadata.xml2
-rw-r--r--net-analyzer/yersinia/metadata.xml2
-rw-r--r--net-analyzer/zabbix/metadata.xml2
-rw-r--r--net-analyzer/zmap/metadata.xml2
-rw-r--r--net-analyzer/zniper/metadata.xml2
275 files changed, 357 insertions, 357 deletions
diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml
index 04d57fdb7b1f..94525d10a811 100644
--- a/net-analyzer/2ping/metadata.xml
+++ b/net-analyzer/2ping/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>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
diff --git a/net-analyzer/aimsniff/metadata.xml b/net-analyzer/aimsniff/metadata.xml
index 6ecac3c88f25..5a524c1fda91 100644
--- a/net-analyzer/aimsniff/metadata.xml
+++ b/net-analyzer/aimsniff/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/alive/metadata.xml
+++ b/net-analyzer/alive/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/amap/metadata.xml
+++ b/net-analyzer/amap/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
index 4d52271d50b5..8064bf27c79f 100644
--- a/net-analyzer/angst/metadata.xml
+++ b/net-analyzer/angst/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/apinger/metadata.xml b/net-analyzer/apinger/metadata.xml
index bc5a7dacba37..6aec7233ff54 100644
--- a/net-analyzer/apinger/metadata.xml
+++ b/net-analyzer/apinger/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml
index 6930324adf23..f94ded5e56fe 100644
--- a/net-analyzer/argus-clients/metadata.xml
+++ b/net-analyzer/argus-clients/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
index 85e6454fc986..90955da4b592 100644
--- a/net-analyzer/argus/metadata.xml
+++ b/net-analyzer/argus/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/arp-scan/metadata.xml
+++ b/net-analyzer/arp-scan/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/arp-sk/metadata.xml b/net-analyzer/arp-sk/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/arp-sk/metadata.xml
+++ b/net-analyzer/arp-sk/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/arping/metadata.xml
+++ b/net-analyzer/arping/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/arpoison/metadata.xml b/net-analyzer/arpoison/metadata.xml
index 9267a85dbe7a..22b19a014fbc 100644
--- a/net-analyzer/arpoison/metadata.xml
+++ b/net-analyzer/arpoison/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/arpon/metadata.xml b/net-analyzer/arpon/metadata.xml
index ea4208c346e9..b6120932cdc5 100644
--- a/net-analyzer/arpon/metadata.xml
+++ b/net-analyzer/arpon/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>
+ <maintainer type="person">
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
diff --git a/net-analyzer/arptools/metadata.xml b/net-analyzer/arptools/metadata.xml
index 1e385042d0b3..ab242cac92e7 100644
--- a/net-analyzer/arptools/metadata.xml
+++ b/net-analyzer/arptools/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml
index a01564b4c124..45a63182fe02 100644
--- a/net-analyzer/arpwatch/metadata.xml
+++ b/net-analyzer/arpwatch/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml
index f0304f765f70..f2d12be5195d 100644
--- a/net-analyzer/barnyard/metadata.xml
+++ b/net-analyzer/barnyard/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
index 0d74a83e5887..7bd3352141b2 100644
--- a/net-analyzer/barnyard2/metadata.xml
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
<description>Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>jason.r.wallace@gmail.com</email>
<name>Jason Wallace</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/bigeye/metadata.xml b/net-analyzer/bigeye/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/bigeye/metadata.xml
+++ b/net-analyzer/bigeye/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/bing/metadata.xml b/net-analyzer/bing/metadata.xml
index 243b1ca9f63a..3c3d5ced6412 100644
--- a/net-analyzer/bing/metadata.xml
+++ b/net-analyzer/bing/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>
+ <maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/net-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml
index 7f1160f2b592..df5705b8008d 100644
--- a/net-analyzer/bmon/metadata.xml
+++ b/net-analyzer/bmon/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/braa/metadata.xml b/net-analyzer/braa/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-analyzer/braa/metadata.xml
+++ b/net-analyzer/braa/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/bsnmp/metadata.xml b/net-analyzer/bsnmp/metadata.xml
index d7caf7d3b1d4..a00f3aeb1f81 100644
--- a/net-analyzer/bsnmp/metadata.xml
+++ b/net-analyzer/bsnmp/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>
+<maintainer type="project">
<email>bsd@gentoo.org</email>
<name>BSD Project</name>
</maintainer>
diff --git a/net-analyzer/bwbar/metadata.xml b/net-analyzer/bwbar/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/bwbar/metadata.xml
+++ b/net-analyzer/bwbar/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/bwmon/metadata.xml b/net-analyzer/bwmon/metadata.xml
index 55d84dd75c51..5d308982f242 100644
--- a/net-analyzer/bwmon/metadata.xml
+++ b/net-analyzer/bwmon/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml
index fc60ad92bd82..a3345073919a 100644
--- a/net-analyzer/bwping/metadata.xml
+++ b/net-analyzer/bwping/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>
+ <maintainer type="person">
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
index a98a420d5e4a..3c9260bb2907 100644
--- a/net-analyzer/cacti-spine/metadata.xml
+++ b/net-analyzer/cacti-spine/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index a5a3ebe1556c..8fae41374fe9 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/calamaris/metadata.xml b/net-analyzer/calamaris/metadata.xml
index 674a277af9fc..1807f641fbf8 100644
--- a/net-analyzer/calamaris/metadata.xml
+++ b/net-analyzer/calamaris/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
index dd5e51579c6f..090046ba85ad 100644
--- a/net-analyzer/carl/metadata.xml
+++ b/net-analyzer/carl/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>klausman@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/cbm/metadata.xml b/net-analyzer/cbm/metadata.xml
index 89ce46a93452..8377d38ed6dc 100644
--- a/net-analyzer/cbm/metadata.xml
+++ b/net-analyzer/cbm/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>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
index 1977731933a4..cbd0ba6214ed 100644
--- a/net-analyzer/chaosreader/metadata.xml
+++ b/net-analyzer/chaosreader/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>rainbow@irh.it</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/check_mk/metadata.xml b/net-analyzer/check_mk/metadata.xml
index 43b0003a1440..caea7f7523e0 100644
--- a/net-analyzer/check_mk/metadata.xml
+++ b/net-analyzer/check_mk/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>morlix@morlix.de</email>
<name>Timo Eissler</name>
<description>maintainer, assign bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml
index 4b6b68191d89..ea40f2783558 100644
--- a/net-analyzer/cloudshark/metadata.xml
+++ b/net-analyzer/cloudshark/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>
+<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
diff --git a/net-analyzer/cnet/metadata.xml b/net-analyzer/cnet/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/cnet/metadata.xml
+++ b/net-analyzer/cnet/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/cryptcat/metadata.xml b/net-analyzer/cryptcat/metadata.xml
index 7b106ad12556..12086277ff16 100644
--- a/net-analyzer/cryptcat/metadata.xml
+++ b/net-analyzer/cryptcat/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/cutter/metadata.xml b/net-analyzer/cutter/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/cutter/metadata.xml
+++ b/net-analyzer/cutter/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
index 5dbeab2f5504..c289cc9010db 100644
--- a/net-analyzer/darkstat/metadata.xml
+++ b/net-analyzer/darkstat/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml
index 7be50d0888b2..c880ff99c6fe 100644
--- a/net-analyzer/dhcp_probe/metadata.xml
+++ b/net-analyzer/dhcp_probe/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>
+ <maintainer type="person">
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/dhcpdump/metadata.xml b/net-analyzer/dhcpdump/metadata.xml
index d7239c52456b..f34967c0f990 100644
--- a/net-analyzer/dhcpdump/metadata.xml
+++ b/net-analyzer/dhcpdump/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/dietsniff/metadata.xml b/net-analyzer/dietsniff/metadata.xml
index c428b128c927..87b0150feae6 100644
--- a/net-analyzer/dietsniff/metadata.xml
+++ b/net-analyzer/dietsniff/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>
+ <maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/net-analyzer/dnsenum/metadata.xml b/net-analyzer/dnsenum/metadata.xml
index f59f8a409b18..72a038d33b49 100644
--- a/net-analyzer/dnsenum/metadata.xml
+++ b/net-analyzer/dnsenum/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>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
diff --git a/net-analyzer/dnstracer/metadata.xml b/net-analyzer/dnstracer/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/dnstracer/metadata.xml
+++ b/net-analyzer/dnstracer/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/dosdetector/metadata.xml b/net-analyzer/dosdetector/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/dosdetector/metadata.xml
+++ b/net-analyzer/dosdetector/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/driftnet/metadata.xml b/net-analyzer/driftnet/metadata.xml
index 4d5ec8627f36..56038b1c27ca 100644
--- a/net-analyzer/driftnet/metadata.xml
+++ b/net-analyzer/driftnet/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
index 436d0d226847..87cd1022ae11 100644
--- a/net-analyzer/dsniff/metadata.xml
+++ b/net-analyzer/dsniff/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/echoping/metadata.xml b/net-analyzer/echoping/metadata.xml
index 142ab5a31443..723d8a307977 100644
--- a/net-analyzer/echoping/metadata.xml
+++ b/net-analyzer/echoping/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml
index 95b9242ab020..1bb807b42b3a 100644
--- a/net-analyzer/egressor/metadata.xml
+++ b/net-analyzer/egressor/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/etherape/metadata.xml b/net-analyzer/etherape/metadata.xml
index b9d123db53d6..81f2ca0b0fae 100644
--- a/net-analyzer/etherape/metadata.xml
+++ b/net-analyzer/etherape/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ethloop/metadata.xml b/net-analyzer/ethloop/metadata.xml
index 2dc4fcb10221..497a26fb249e 100644
--- a/net-analyzer/ethloop/metadata.xml
+++ b/net-analyzer/ethloop/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml
index af192ee45b2c..a98ad417c5f9 100644
--- a/net-analyzer/ettercap/metadata.xml
+++ b/net-analyzer/ettercap/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>ago@gentoo.org</email>
<name>Agostino Sarubbo</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index 6f5ffffeae11..ece130a93bd2 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/fe3d/metadata.xml b/net-analyzer/fe3d/metadata.xml
index 7c1660250320..236e695e0390 100644
--- a/net-analyzer/fe3d/metadata.xml
+++ b/net-analyzer/fe3d/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ffp/metadata.xml b/net-analyzer/ffp/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/ffp/metadata.xml
+++ b/net-analyzer/ffp/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/firewalk/metadata.xml b/net-analyzer/firewalk/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/firewalk/metadata.xml
+++ b/net-analyzer/firewalk/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml
index 4f0bbb1755b7..e2ec7efaf9f5 100644
--- a/net-analyzer/flow-tools/metadata.xml
+++ b/net-analyzer/flow-tools/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/flowgrind/metadata.xml b/net-analyzer/flowgrind/metadata.xml
index 15e6b5939ff5..c16842bb234d 100644
--- a/net-analyzer/flowgrind/metadata.xml
+++ b/net-analyzer/flowgrind/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml
index 3ca54aca4996..1801de2b7670 100644
--- a/net-analyzer/fping/metadata.xml
+++ b/net-analyzer/fping/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/fprobe/metadata.xml b/net-analyzer/fprobe/metadata.xml
index 5f056ee61ba2..0fd136315cb2 100644
--- a/net-analyzer/fprobe/metadata.xml
+++ b/net-analyzer/fprobe/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml
index 1cc1b5529e77..f8f153715435 100644
--- a/net-analyzer/fragroute/metadata.xml
+++ b/net-analyzer/fragroute/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ftester/metadata.xml b/net-analyzer/ftester/metadata.xml
index 85aeafd79899..f7f593381e2c 100644
--- a/net-analyzer/ftester/metadata.xml
+++ b/net-analyzer/ftester/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/fwlogwatch/metadata.xml b/net-analyzer/fwlogwatch/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/fwlogwatch/metadata.xml
+++ b/net-analyzer/fwlogwatch/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/gensink/metadata.xml b/net-analyzer/gensink/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/gensink/metadata.xml
+++ b/net-analyzer/gensink/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/gnome-nettool/metadata.xml b/net-analyzer/gnome-nettool/metadata.xml
index fe3dc94b2bcd..39980802b1da 100644
--- a/net-analyzer/gnome-nettool/metadata.xml
+++ b/net-analyzer/gnome-nettool/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>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-analyzer/gnu-netcat/metadata.xml b/net-analyzer/gnu-netcat/metadata.xml
index e02b1b613be7..cc4e9c9f18c3 100644
--- a/net-analyzer/gnu-netcat/metadata.xml
+++ b/net-analyzer/gnu-netcat/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index 093bbebf262b..51d6d6ee8eef 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>spiderx@spiderx.dp.ua</email>
<name>Vladimir Pavljuchenkov</name>
<description>Proxy maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml
index 0495a2375539..ccd32e8fbac8 100644
--- a/net-analyzer/gr-fosphor/metadata.xml
+++ b/net-analyzer/gr-fosphor/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>
+ <maintainer type="project">
<email>radio@gentoo.org</email>
<name>Radio</name>
</maintainer>
diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml
index 92e7f9027c11..14056ae27e7d 100644
--- a/net-analyzer/graphite-web/metadata.xml
+++ b/net-analyzer/graphite-web/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>
+ <maintainer type="person">
<email>grobian@gentoo.org</email>
<name>Fabian Groffen</name>
</maintainer>
diff --git a/net-analyzer/greenbone-security-assistant/metadata.xml b/net-analyzer/greenbone-security-assistant/metadata.xml
index 45b99c65fb75..38ce6c17a3f2 100644
--- a/net-analyzer/greenbone-security-assistant/metadata.xml
+++ b/net-analyzer/greenbone-security-assistant/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/gsm-receiver/metadata.xml b/net-analyzer/gsm-receiver/metadata.xml
index 370d4d1560cb..1570f891c6a3 100644
--- a/net-analyzer/gsm-receiver/metadata.xml
+++ b/net-analyzer/gsm-receiver/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>
+ <maintainer type="project">
<email>radio@gentoo.org</email>
<name>Radio</name>
</maintainer>
diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/hping/metadata.xml
+++ b/net-analyzer/hping/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml
index 360668e9079e..b3a969016433 100644
--- a/net-analyzer/httping/metadata.xml
+++ b/net-analyzer/httping/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/hunt/metadata.xml b/net-analyzer/hunt/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/hunt/metadata.xml
+++ b/net-analyzer/hunt/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 05d2ef7b7025..40f7b4bb57bc 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ibmonitor/metadata.xml b/net-analyzer/ibmonitor/metadata.xml
index 96bd348166ec..2488b71436bd 100644
--- a/net-analyzer/ibmonitor/metadata.xml
+++ b/net-analyzer/ibmonitor/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
index f2e0b4f7ce88..224b578f16c1 100644
--- a/net-analyzer/icinga-web/metadata.xml
+++ b/net-analyzer/icinga-web/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>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index ebbec98ccf81..958f95e0f18f 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -10,7 +10,7 @@
<flag name="web">Adds generic web interface support</flag>
<flag name="eventhandler">Adds support for running custom scripts whenever a host or service state change occurs</flag>
</use>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index 4e11ea28e600..b03390bc2e50 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/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>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/net-analyzer/ifmetric/metadata.xml b/net-analyzer/ifmetric/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-analyzer/ifmetric/metadata.xml
+++ b/net-analyzer/ifmetric/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml
index 259f96bc0d8a..eb3a67f58626 100644
--- a/net-analyzer/ifstat/metadata.xml
+++ b/net-analyzer/ifstat/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>jer@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ifstatus/metadata.xml b/net-analyzer/ifstatus/metadata.xml
index 804011732b21..2a57e972be89 100644
--- a/net-analyzer/ifstatus/metadata.xml
+++ b/net-analyzer/ifstatus/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml
index fcdeee5abccf..789a44405524 100644
--- a/net-analyzer/iftop/metadata.xml
+++ b/net-analyzer/iftop/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ike-scan/metadata.xml b/net-analyzer/ike-scan/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-analyzer/ike-scan/metadata.xml
+++ b/net-analyzer/ike-scan/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ipaudit/metadata.xml b/net-analyzer/ipaudit/metadata.xml
index 1e56dda90cde..9b6b0277edf6 100644
--- a/net-analyzer/ipaudit/metadata.xml
+++ b/net-analyzer/ipaudit/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>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
diff --git a/net-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml
index 7bb54236ceeb..1a6bed5f2dea 100644
--- a/net-analyzer/ipband/metadata.xml
+++ b/net-analyzer/ipband/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ipcad/metadata.xml b/net-analyzer/ipcad/metadata.xml
index 7be0944d537c..007abc824220 100644
--- a/net-analyzer/ipcad/metadata.xml
+++ b/net-analyzer/ipcad/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ipgen/metadata.xml b/net-analyzer/ipgen/metadata.xml
index a03488061bf4..2f99ecc465ec 100644
--- a/net-analyzer/ipgen/metadata.xml
+++ b/net-analyzer/ipgen/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ipguard/metadata.xml b/net-analyzer/ipguard/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/ipguard/metadata.xml
+++ b/net-analyzer/ipguard/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml
index b020e0c8d258..8d4f6dcb5209 100644
--- a/net-analyzer/iplog/metadata.xml
+++ b/net-analyzer/iplog/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ippl/metadata.xml b/net-analyzer/ippl/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/ippl/metadata.xml
+++ b/net-analyzer/ippl/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/iptraf-ng/metadata.xml b/net-analyzer/iptraf-ng/metadata.xml
index d59ac170f96b..68c7fc650126 100644
--- a/net-analyzer/iptraf-ng/metadata.xml
+++ b/net-analyzer/iptraf-ng/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml
index 462ab8ac514b..371b269c420e 100644
--- a/net-analyzer/iptstate/metadata.xml
+++ b/net-analyzer/iptstate/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ipv6-toolkit/metadata.xml b/net-analyzer/ipv6-toolkit/metadata.xml
index 2266b6e8735b..77ae52731a8d 100644
--- a/net-analyzer/ipv6-toolkit/metadata.xml
+++ b/net-analyzer/ipv6-toolkit/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>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
diff --git a/net-analyzer/isic/metadata.xml b/net-analyzer/isic/metadata.xml
index 60d26bacb0ee..27b1e5096bbf 100644
--- a/net-analyzer/isic/metadata.xml
+++ b/net-analyzer/isic/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml
index 0566ec8912eb..a7910963dea7 100644
--- a/net-analyzer/jffnms/metadata.xml
+++ b/net-analyzer/jffnms/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml
index bf91f7be8ceb..737e4b4746ff 100644
--- a/net-analyzer/jmx2munin/metadata.xml
+++ b/net-analyzer/jmx2munin/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>
+ <maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml
index 2992f52eac57..819c7823b02c 100644
--- a/net-analyzer/jnettop/metadata.xml
+++ b/net-analyzer/jnettop/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml
index e0c71ce6d03d..490337f25c7d 100644
--- a/net-analyzer/knocker/metadata.xml
+++ b/net-analyzer/knocker/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/labrea/metadata.xml b/net-analyzer/labrea/metadata.xml
index bc943cd801f3..4b6eef6e2752 100644
--- a/net-analyzer/labrea/metadata.xml
+++ b/net-analyzer/labrea/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/lft/metadata.xml b/net-analyzer/lft/metadata.xml
index d5c9b7dddc63..a660a576a19f 100644
--- a/net-analyzer/lft/metadata.xml
+++ b/net-analyzer/lft/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/libnasl/metadata.xml b/net-analyzer/libnasl/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/libnasl/metadata.xml
+++ b/net-analyzer/libnasl/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/lilac/metadata.xml b/net-analyzer/lilac/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/lilac/metadata.xml
+++ b/net-analyzer/lilac/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 2fa446ef9d78..a6766a810cb2 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/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>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/net-analyzer/macchanger/metadata.xml b/net-analyzer/macchanger/metadata.xml
index 406b0f026d38..27fa81884460 100644
--- a/net-analyzer/macchanger/metadata.xml
+++ b/net-analyzer/macchanger/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>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml
index 1878a65edef5..ab58c05fdec9 100644
--- a/net-analyzer/masscan/metadata.xml
+++ b/net-analyzer/masscan/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/mate-netspeed/metadata.xml b/net-analyzer/mate-netspeed/metadata.xml
index 416ec0faae8d..8cda0a39b6d2 100644
--- a/net-analyzer/mate-netspeed/metadata.xml
+++ b/net-analyzer/mate-netspeed/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>
+ <maintainer type="project">
<email>mate@gentoo.org</email>
<name>Gentoo MATE Desktop</name>
</maintainer>
diff --git a/net-analyzer/mbrowse/metadata.xml b/net-analyzer/mbrowse/metadata.xml
index 0c2684221431..600ef9a54661 100644
--- a/net-analyzer/mbrowse/metadata.xml
+++ b/net-analyzer/mbrowse/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/metasploit/metadata.xml b/net-analyzer/metasploit/metadata.xml
index eae4ef006e12..c10c4c21830d 100644
--- a/net-analyzer/metasploit/metadata.xml
+++ b/net-analyzer/metasploit/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>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
<description>Very delicate package, ask before you touch please</description>
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 4a222db9733a..f355cb420c63 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Primary maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
<description>Secondary maintainer. Please CC on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/mping/metadata.xml b/net-analyzer/mping/metadata.xml
index 4f14f22533bb..583e01eed1e7 100644
--- a/net-analyzer/mping/metadata.xml
+++ b/net-analyzer/mping/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/mrtg-ping-probe/metadata.xml b/net-analyzer/mrtg-ping-probe/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/mrtg-ping-probe/metadata.xml
+++ b/net-analyzer/mrtg-ping-probe/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/mrtg/metadata.xml b/net-analyzer/mrtg/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/mrtg/metadata.xml
+++ b/net-analyzer/mrtg/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/multimon-ng/metadata.xml b/net-analyzer/multimon-ng/metadata.xml
index 9970c04f8711..906e7071eae7 100644
--- a/net-analyzer/multimon-ng/metadata.xml
+++ b/net-analyzer/multimon-ng/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>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>radio@gentoo.org</email>
<name>Radio</name>
</maintainer>
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 4b98ad6cec2e..7efd7f99d8e6 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/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>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml
index 2856194152b8..d47d6761c6fc 100644
--- a/net-analyzer/nagios-check_dnssec/metadata.xml
+++ b/net-analyzer/nagios-check_dnssec/metadata.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_fail2ban/metadata.xml b/net-analyzer/nagios-check_fail2ban/metadata.xml
index c0104668059a..17572f471bc7 100644
--- a/net-analyzer/nagios-check_fail2ban/metadata.xml
+++ b/net-analyzer/nagios-check_fail2ban/metadata.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>sdamashek@gentoo.org</email>
<name>Samuel Damashek</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml
index 98186e5c7599..2429b6c7695f 100644
--- a/net-analyzer/nagios-check_glsa2/metadata.xml
+++ b/net-analyzer/nagios-check_glsa2/metadata.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
index a445fad78e74..ce7012f3276a 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
+++ b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>wfischer@thomas-krenn.com</email>
<name>Werner Fischer</name>
<description>Upstream Maintainer (please CC on bugs)</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_linux_bonding/metadata.xml b/net-analyzer/nagios-check_linux_bonding/metadata.xml
index 0101892b674e..1b3572fd9b8e 100644
--- a/net-analyzer/nagios-check_linux_bonding/metadata.xml
+++ b/net-analyzer/nagios-check_linux_bonding/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>
+ <maintainer type="person">
<email>ercpe@gentoo.org</email>
<name>Johann Schmitz (ercpe)</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml
index 45bc981e1bfb..348089226470 100644
--- a/net-analyzer/nagios-check_logfiles/metadata.xml
+++ b/net-analyzer/nagios-check_logfiles/metadata.xml
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>nvinson234@gmail.com</email>
<name>Nicholas Vinson</name>
<description>Proxy maintainer to be assigned bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_mysql_health/metadata.xml b/net-analyzer/nagios-check_mysql_health/metadata.xml
index d2001e3508ce..10e1b18fa234 100644
--- a/net-analyzer/nagios-check_mysql_health/metadata.xml
+++ b/net-analyzer/nagios-check_mysql_health/metadata.xml
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
<description>Secondary maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>sdamashek@gentoo.org</email>
<name>Samuel Damashek</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_openvpn-simple/metadata.xml b/net-analyzer/nagios-check_openvpn-simple/metadata.xml
index df7fdbeaf2b3..45125b9b6e99 100644
--- a/net-analyzer/nagios-check_openvpn-simple/metadata.xml
+++ b/net-analyzer/nagios-check_openvpn-simple/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>
+ <maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_pidfile/metadata.xml b/net-analyzer/nagios-check_pidfile/metadata.xml
index 8e21b3f7427c..80d7059fe52c 100644
--- a/net-analyzer/nagios-check_pidfile/metadata.xml
+++ b/net-analyzer/nagios-check_pidfile/metadata.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>sdamashek@gentoo.org</email>
<name>Samuel Damashek</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml
index f6b42d8b99ef..da39e4539a6a 100644
--- a/net-analyzer/nagios-check_rbl/metadata.xml
+++ b/net-analyzer/nagios-check_rbl/metadata.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index c0d10a676a9b..946980a9837c 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
index 5783557264cf..a168012496ae 100644
--- a/net-analyzer/nagios-plugins-flameeyes/metadata.xml
+++ b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml
index 2856194152b8..d47d6761c6fc 100644
--- a/net-analyzer/nagios-plugins-snmp/metadata.xml
+++ b/net-analyzer/nagios-plugins-snmp/metadata.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 9eddfd3c6bfa..b3c91a24d047 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
<description>Maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
index 7aa22c806416..e17bce8a5ce4 100644
--- a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
+++ b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagios/metadata.xml b/net-analyzer/nagios/metadata.xml
index 87d52f0ff0c7..55c38bf803c3 100644
--- a/net-analyzer/nagios/metadata.xml
+++ b/net-analyzer/nagios/metadata.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>creffett@gentoo.org</email>
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagircbot/metadata.xml b/net-analyzer/nagircbot/metadata.xml
index e4a40fb82a93..1d0d59c9a025 100644
--- a/net-analyzer/nagircbot/metadata.xml
+++ b/net-analyzer/nagircbot/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>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nagstamon/metadata.xml b/net-analyzer/nagstamon/metadata.xml
index 05be79d00cf9..596c2d8745d0 100644
--- a/net-analyzer/nagstamon/metadata.xml
+++ b/net-analyzer/nagstamon/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>
+ <maintainer type="person">
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/namebench/metadata.xml b/net-analyzer/namebench/metadata.xml
index fdee50885e83..24087fdb9b23 100644
--- a/net-analyzer/namebench/metadata.xml
+++ b/net-analyzer/namebench/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nast/metadata.xml b/net-analyzer/nast/metadata.xml
index 8088de48dd32..01ab90fe15dc 100644
--- a/net-analyzer/nast/metadata.xml
+++ b/net-analyzer/nast/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nbtscan/metadata.xml b/net-analyzer/nbtscan/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/nbtscan/metadata.xml
+++ b/net-analyzer/nbtscan/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nbwmon/metadata.xml b/net-analyzer/nbwmon/metadata.xml
index d96f61e501ff..07903da6f676 100644
--- a/net-analyzer/nbwmon/metadata.xml
+++ b/net-analyzer/nbwmon/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ncrack/metadata.xml b/net-analyzer/ncrack/metadata.xml
index 69859c558edb..e0f66e9541d1 100644
--- a/net-analyzer/ncrack/metadata.xml
+++ b/net-analyzer/ncrack/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>
+<maintainer type="person">
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
diff --git a/net-analyzer/ndoutils/metadata.xml b/net-analyzer/ndoutils/metadata.xml
index 4c6e8086dbc7..325efab1c501 100644
--- a/net-analyzer/ndoutils/metadata.xml
+++ b/net-analyzer/ndoutils/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ndsad/metadata.xml b/net-analyzer/ndsad/metadata.xml
index 4c1e333f80cb..18ff97735235 100644
--- a/net-analyzer/ndsad/metadata.xml
+++ b/net-analyzer/ndsad/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nepenthes/metadata.xml b/net-analyzer/nepenthes/metadata.xml
index af9c9fc7611c..c9e6deb2a32f 100644
--- a/net-analyzer/nepenthes/metadata.xml
+++ b/net-analyzer/nepenthes/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/nessus-bin/metadata.xml
+++ b/net-analyzer/nessus-bin/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nessus-client/metadata.xml b/net-analyzer/nessus-client/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/nessus-client/metadata.xml
+++ b/net-analyzer/nessus-client/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nessus-core/metadata.xml b/net-analyzer/nessus-core/metadata.xml
index 28617c0ee359..3907d4a0d0e6 100644
--- a/net-analyzer/nessus-core/metadata.xml
+++ b/net-analyzer/nessus-core/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nessus-libraries/metadata.xml b/net-analyzer/nessus-libraries/metadata.xml
index 9c61f0b2f47b..41f809fbde83 100644
--- a/net-analyzer/nessus-libraries/metadata.xml
+++ b/net-analyzer/nessus-libraries/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nessus-plugins/metadata.xml b/net-analyzer/nessus-plugins/metadata.xml
index 68500b4bf01d..3c5a6082eb8f 100644
--- a/net-analyzer/nessus-plugins/metadata.xml
+++ b/net-analyzer/nessus-plugins/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nessus/metadata.xml b/net-analyzer/nessus/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/nessus/metadata.xml
+++ b/net-analyzer/nessus/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index bdef877fc332..99462311c12e 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 72fe9c903077..1b0803d3aadf 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>vapier@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netcat6/metadata.xml b/net-analyzer/netcat6/metadata.xml
index 9d35c4410984..3baf3341ea46 100644
--- a/net-analyzer/netcat6/metadata.xml
+++ b/net-analyzer/netcat6/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netdiscover/metadata.xml b/net-analyzer/netdiscover/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/netdiscover/metadata.xml
+++ b/net-analyzer/netdiscover/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml
index 9445b182c483..6e0d6d0e8c71 100644
--- a/net-analyzer/nethogs/metadata.xml
+++ b/net-analyzer/nethogs/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml
index 3aebb7e5c9ce..95148c0af8a3 100644
--- a/net-analyzer/neti/metadata.xml
+++ b/net-analyzer/neti/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netio/metadata.xml b/net-analyzer/netio/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/netio/metadata.xml
+++ b/net-analyzer/netio/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index 9f6fe3720a31..a4f8a9ad475d 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/netselect/metadata.xml
+++ b/net-analyzer/netselect/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-analyzer/netsniff-ng/metadata.xml
+++ b/net-analyzer/netsniff-ng/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>
+<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/net-analyzer/nettop/metadata.xml b/net-analyzer/nettop/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/nettop/metadata.xml
+++ b/net-analyzer/nettop/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netwag/metadata.xml b/net-analyzer/netwag/metadata.xml
index 5027a72edb98..9d880b0dc867 100644
--- a/net-analyzer/netwag/metadata.xml
+++ b/net-analyzer/netwag/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
index 12602f4ec983..fb98d86a637d 100644
--- a/net-analyzer/netwatch/metadata.xml
+++ b/net-analyzer/netwatch/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>
+<maintainer type="person">
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml
index 7b2e7d1a9974..feba708bd35b 100644
--- a/net-analyzer/netwox/metadata.xml
+++ b/net-analyzer/netwox/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index b2c7b0b920da..279edac1ab01 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
index f54d1f424556..a8fcd8f42981 100644
--- a/net-analyzer/ngrep/metadata.xml
+++ b/net-analyzer/ngrep/metadata.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>jpr5+gentoo@darkridge.com</email>
<name>Jordan Ritter</name>
<description>Program author who would like to be notified of bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/nipper/metadata.xml b/net-analyzer/nipper/metadata.xml
index 9db322fd2d7f..cb9bfb3173de 100644
--- a/net-analyzer/nipper/metadata.xml
+++ b/net-analyzer/nipper/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>
+ <maintainer type="person">
<email>ikelos@gentoo.org</email>
<name>Mike Auty</name>
</maintainer>
diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml
index fcdeee5abccf..789a44405524 100644
--- a/net-analyzer/nload/metadata.xml
+++ b/net-analyzer/nload/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 23bb98edf8df..50be26d87be0 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nmapsi/metadata.xml b/net-analyzer/nmapsi/metadata.xml
index 14547b17ac6a..bc1cac52f26b 100644
--- a/net-analyzer/nmapsi/metadata.xml
+++ b/net-analyzer/nmapsi/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>
+ <maintainer type="project">
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
diff --git a/net-analyzer/nodebrain/metadata.xml b/net-analyzer/nodebrain/metadata.xml
index 50722ae019b7..b1e688b96833 100644
--- a/net-analyzer/nodebrain/metadata.xml
+++ b/net-analyzer/nodebrain/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml
index b97877f841bd..e47fd6fd83c9 100644
--- a/net-analyzer/nrpe/metadata.xml
+++ b/net-analyzer/nrpe/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>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nsat/metadata.xml b/net-analyzer/nsat/metadata.xml
index 50205b2e8c10..0b7d0914b40c 100644
--- a/net-analyzer/nsat/metadata.xml
+++ b/net-analyzer/nsat/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/nsca/metadata.xml b/net-analyzer/nsca/metadata.xml
index 5bac87cea856..685ec5c4b9fe 100644
--- a/net-analyzer/nsca/metadata.xml
+++ b/net-analyzer/nsca/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>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/nstats/metadata.xml b/net-analyzer/nstats/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/nstats/metadata.xml
+++ b/net-analyzer/nstats/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
index bb3e6f6bad1e..00542da20918 100644
--- a/net-analyzer/ntop/metadata.xml
+++ b/net-analyzer/ntop/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ntopng/metadata.xml b/net-analyzer/ntopng/metadata.xml
index 81f9642ed03f..cab61f7e001d 100644
--- a/net-analyzer/ntopng/metadata.xml
+++ b/net-analyzer/ntopng/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>
+ <maintainer type="person">
<email>slis@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-analyzer/nttcp/metadata.xml b/net-analyzer/nttcp/metadata.xml
index f7ee654536a1..c9c02c73ae91 100644
--- a/net-analyzer/nttcp/metadata.xml
+++ b/net-analyzer/nttcp/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml
index 57ccbcb5b9d9..0ee3957c39c0 100644
--- a/net-analyzer/odhcploc/metadata.xml
+++ b/net-analyzer/odhcploc/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>
+ <maintainer type="person">
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/oinkmaster/metadata.xml b/net-analyzer/oinkmaster/metadata.xml
index cc7064aa854e..ec5e8f6c9ef7 100644
--- a/net-analyzer/oinkmaster/metadata.xml
+++ b/net-analyzer/oinkmaster/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/openbsd-netcat/metadata.xml b/net-analyzer/openbsd-netcat/metadata.xml
index 2eb55f5f9145..e6b017e50acc 100644
--- a/net-analyzer/openbsd-netcat/metadata.xml
+++ b/net-analyzer/openbsd-netcat/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>
+<maintainer type="person">
<email>heroxbd@gentoo.org</email>
<name>Benda Xu</name>
</maintainer>
diff --git a/net-analyzer/openvas-cli/metadata.xml b/net-analyzer/openvas-cli/metadata.xml
index 45b99c65fb75..38ce6c17a3f2 100644
--- a/net-analyzer/openvas-cli/metadata.xml
+++ b/net-analyzer/openvas-cli/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/openvas-libraries/metadata.xml b/net-analyzer/openvas-libraries/metadata.xml
index 45b99c65fb75..38ce6c17a3f2 100644
--- a/net-analyzer/openvas-libraries/metadata.xml
+++ b/net-analyzer/openvas-libraries/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/openvas-manager/metadata.xml b/net-analyzer/openvas-manager/metadata.xml
index 45b99c65fb75..38ce6c17a3f2 100644
--- a/net-analyzer/openvas-manager/metadata.xml
+++ b/net-analyzer/openvas-manager/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/openvas-scanner/metadata.xml b/net-analyzer/openvas-scanner/metadata.xml
index 45b99c65fb75..38ce6c17a3f2 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/openvas-tools/metadata.xml b/net-analyzer/openvas-tools/metadata.xml
index 45b99c65fb75..38ce6c17a3f2 100644
--- a/net-analyzer/openvas-tools/metadata.xml
+++ b/net-analyzer/openvas-tools/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/openvas/metadata.xml b/net-analyzer/openvas/metadata.xml
index 8f15caac18e1..deaaa375afde 100644
--- a/net-analyzer/openvas/metadata.xml
+++ b/net-analyzer/openvas/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
<use>
diff --git a/net-analyzer/ospd/metadata.xml b/net-analyzer/ospd/metadata.xml
index 45b99c65fb75..38ce6c17a3f2 100644
--- a/net-analyzer/ospd/metadata.xml
+++ b/net-analyzer/ospd/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>
+ <maintainer type="person">
<email>hanno@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/ostinato/metadata.xml b/net-analyzer/ostinato/metadata.xml
index 2fab0a213dec..fb90fd94be6f 100644
--- a/net-analyzer/ostinato/metadata.xml
+++ b/net-analyzer/ostinato/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>
+ <maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
diff --git a/net-analyzer/p0f/metadata.xml b/net-analyzer/p0f/metadata.xml
index beb8daaee09d..90d1006a28a0 100644
--- a/net-analyzer/p0f/metadata.xml
+++ b/net-analyzer/p0f/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/packit/metadata.xml b/net-analyzer/packit/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/packit/metadata.xml
+++ b/net-analyzer/packit/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/pathload/metadata.xml b/net-analyzer/pathload/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/pathload/metadata.xml
+++ b/net-analyzer/pathload/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/pbnj/metadata.xml b/net-analyzer/pbnj/metadata.xml
index 539b5487f6cf..8bb648a0427a 100644
--- a/net-analyzer/pbnj/metadata.xml
+++ b/net-analyzer/pbnj/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>jabra@ccs.neu.edu</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/pchar/metadata.xml b/net-analyzer/pchar/metadata.xml
index 15fef34887ef..f1fd21ae99d5 100644
--- a/net-analyzer/pchar/metadata.xml
+++ b/net-analyzer/pchar/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>
+<maintainer type="person">
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml
index 99bc8105a58b..55504110a817 100644
--- a/net-analyzer/pinger/metadata.xml
+++ b/net-analyzer/pinger/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/pktstat/metadata.xml b/net-analyzer/pktstat/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/pktstat/metadata.xml
+++ b/net-analyzer/pktstat/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index 49d7e86b41af..46cfcd1fff7d 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index 29377207a88e..379fdde3e076 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/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>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-analyzer/poink/metadata.xml b/net-analyzer/poink/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-analyzer/poink/metadata.xml
+++ b/net-analyzer/poink/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>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/portmon/metadata.xml
+++ b/net-analyzer/portmon/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/portsentry/metadata.xml b/net-analyzer/portsentry/metadata.xml
index c9568be5721a..99bfe72a50cf 100644
--- a/net-analyzer/portsentry/metadata.xml
+++ b/net-analyzer/portsentry/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/postal/metadata.xml b/net-analyzer/postal/metadata.xml
index cf7950eb8559..1c3bc7b3fcef 100644
--- a/net-analyzer/postal/metadata.xml
+++ b/net-analyzer/postal/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>
+ <maintainer type="project">
<email>net-mail@gentoo.org</email>
<name>Net-Mail</name>
</maintainer>
diff --git a/net-analyzer/pypacker/metadata.xml b/net-analyzer/pypacker/metadata.xml
index 20afb1848538..c3888efc00a8 100644
--- a/net-analyzer/pypacker/metadata.xml
+++ b/net-analyzer/pypacker/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml
index c83b3351067a..2a7b2d66bb99 100644
--- a/net-analyzer/quidscor/metadata.xml
+++ b/net-analyzer/quidscor/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/raddump/metadata.xml b/net-analyzer/raddump/metadata.xml
index ab48ab746cd5..031c18c54a9f 100644
--- a/net-analyzer/raddump/metadata.xml
+++ b/net-analyzer/raddump/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>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-analyzer/rain/metadata.xml b/net-analyzer/rain/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/rain/metadata.xml
+++ b/net-analyzer/rain/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
index a463cfc257c4..f57278f1e3c7 100644
--- a/net-analyzer/ripe-atlas-tools/metadata.xml
+++ b/net-analyzer/ripe-atlas-tools/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>gentoo@danielquinn.org</email>
<name>Daniel Quinn</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/rrdcollect/metadata.xml b/net-analyzer/rrdcollect/metadata.xml
index 95cff0eceb5b..100eb9f44e4a 100644
--- a/net-analyzer/rrdcollect/metadata.xml
+++ b/net-analyzer/rrdcollect/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index fca655c1dba5..a6a291c9723d 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
index e452a4d4e2d9..3f2ab8cd615e 100644
--- a/net-analyzer/sancp/metadata.xml
+++ b/net-analyzer/sancp/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index 7ea602b12384..deaa23376cb0 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sbd/metadata.xml b/net-analyzer/sbd/metadata.xml
index bb8533126ba4..38408b55071e 100644
--- a/net-analyzer/sbd/metadata.xml
+++ b/net-analyzer/sbd/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/scanlogd/metadata.xml b/net-analyzer/scanlogd/metadata.xml
index 4fdf0b9ee629..23b1ab5a12ae 100644
--- a/net-analyzer/scanlogd/metadata.xml
+++ b/net-analyzer/scanlogd/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/scanssh/metadata.xml b/net-analyzer/scanssh/metadata.xml
index 753c1bfa8a47..afd56fd6df8d 100644
--- a/net-analyzer/scanssh/metadata.xml
+++ b/net-analyzer/scanssh/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index 1edffb1631da..444627a89171 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/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>
+ <maintainer type="person">
<email>ikelos@gentoo.org</email>
<name>Mike Auty</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-analyzer/scli/metadata.xml
+++ b/net-analyzer/scli/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml
index 3a36d21f869e..c1f87513ea9f 100644
--- a/net-analyzer/sec/metadata.xml
+++ b/net-analyzer/sec/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml
index fcdeee5abccf..789a44405524 100644
--- a/net-analyzer/sflowtool/metadata.xml
+++ b/net-analyzer/sflowtool/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml
index d08e3b8a76c8..ca324d618d91 100644
--- a/net-analyzer/sguil-client/metadata.xml
+++ b/net-analyzer/sguil-client/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml
index d08e3b8a76c8..ca324d618d91 100644
--- a/net-analyzer/sguil-sensor/metadata.xml
+++ b/net-analyzer/sguil-sensor/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml
index d08e3b8a76c8..ca324d618d91 100644
--- a/net-analyzer/sguil-server/metadata.xml
+++ b/net-analyzer/sguil-server/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sinfo/metadata.xml b/net-analyzer/sinfo/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/sinfo/metadata.xml
+++ b/net-analyzer/sinfo/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/siphon/metadata.xml
+++ b/net-analyzer/siphon/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/slurm/metadata.xml
+++ b/net-analyzer/slurm/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index be50b1d16856..e445720edf9f 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/sniffit/metadata.xml
+++ b/net-analyzer/sniffit/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/snips/metadata.xml b/net-analyzer/snips/metadata.xml
index 883740516b06..c0ebd6414a53 100644
--- a/net-analyzer/snips/metadata.xml
+++ b/net-analyzer/snips/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>
+<maintainer type="person">
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
diff --git a/net-analyzer/snmptt/metadata.xml b/net-analyzer/snmptt/metadata.xml
index 56fcb6916ab1..d898065740e6 100644
--- a/net-analyzer/snmptt/metadata.xml
+++ b/net-analyzer/snmptt/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index f1264ba75beb..145c62de86a9 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
<description>Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>jason.r.wallace@gmail.com</email>
<name>Jason Wallace</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/snortalog/metadata.xml b/net-analyzer/snortalog/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/snortalog/metadata.xml
+++ b/net-analyzer/snortalog/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml
index fcdeee5abccf..789a44405524 100644
--- a/net-analyzer/snortsam/metadata.xml
+++ b/net-analyzer/snortsam/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/softflowd/metadata.xml b/net-analyzer/softflowd/metadata.xml
index 377b96b6c6ac..35892ab7c2d1 100644
--- a/net-analyzer/softflowd/metadata.xml
+++ b/net-analyzer/softflowd/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/speedtest-cli/metadata.xml b/net-analyzer/speedtest-cli/metadata.xml
index 36dc4df50812..186cbe3a3ca9 100644
--- a/net-analyzer/speedtest-cli/metadata.xml
+++ b/net-analyzer/speedtest-cli/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>
+ <maintainer type="person">
<email>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
diff --git a/net-analyzer/sqlninja/metadata.xml b/net-analyzer/sqlninja/metadata.xml
index 5d16ffe240b8..d30509206f02 100644
--- a/net-analyzer/sqlninja/metadata.xml
+++ b/net-analyzer/sqlninja/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>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/squid-graph/metadata.xml b/net-analyzer/squid-graph/metadata.xml
index bdc41c6ac38e..db2b74207c46 100644
--- a/net-analyzer/squid-graph/metadata.xml
+++ b/net-analyzer/squid-graph/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/squidsites/metadata.xml b/net-analyzer/squidsites/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/squidsites/metadata.xml
+++ b/net-analyzer/squidsites/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/sslscan/metadata.xml b/net-analyzer/sslscan/metadata.xml
index 141f7b271a9c..36b5b45c8d37 100644
--- a/net-analyzer/sslscan/metadata.xml
+++ b/net-analyzer/sslscan/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>
+ <maintainer type="person">
<email>graaff@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-analyzer/sslsniff/metadata.xml b/net-analyzer/sslsniff/metadata.xml
index ac4283867e48..44077c9f826f 100644
--- a/net-analyzer/sslsniff/metadata.xml
+++ b/net-analyzer/sslsniff/metadata.xml
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
<description>co-maintainer</description>
diff --git a/net-analyzer/ssmping/metadata.xml b/net-analyzer/ssmping/metadata.xml
index dbe54ab223e5..6b5a5e467aff 100644
--- a/net-analyzer/ssmping/metadata.xml
+++ b/net-analyzer/ssmping/metadata.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>venaas@uninett.no</email>
<name>Stig Venaas (upstream)</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml
index 34c1b31f136c..9ec4bf7286c8 100644
--- a/net-analyzer/suricata/metadata.xml
+++ b/net-analyzer/suricata/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>
+ <maintainer type="person">
<email>slis@gentoo.org</email>
</maintainer>
<use>
diff --git a/net-analyzer/symon/metadata.xml b/net-analyzer/symon/metadata.xml
index 107c91ffef22..ed375df28cbc 100644
--- a/net-analyzer/symon/metadata.xml
+++ b/net-analyzer/symon/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/synscan/metadata.xml b/net-analyzer/synscan/metadata.xml
index c2d865517c00..f1250f43eb90 100644
--- a/net-analyzer/synscan/metadata.xml
+++ b/net-analyzer/synscan/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>
+ <maintainer type="person">
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
diff --git a/net-analyzer/syweb/metadata.xml b/net-analyzer/syweb/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-analyzer/syweb/metadata.xml
+++ b/net-analyzer/syweb/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 1dba729c5ef3..98ad8e5d5ad8 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml
index 2bb80e938078..2e463748f7a6 100644
--- a/net-analyzer/tcpflow/metadata.xml
+++ b/net-analyzer/tcpflow/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcping/metadata.xml b/net-analyzer/tcping/metadata.xml
index 0f350e3d4d81..d04de4894ede 100644
--- a/net-analyzer/tcping/metadata.xml
+++ b/net-analyzer/tcping/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>
+<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/net-analyzer/tcpreen/metadata.xml b/net-analyzer/tcpreen/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/tcpreen/metadata.xml
+++ b/net-analyzer/tcpreen/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index 43ac8de13f5d..e53da7185c86 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml
index 68fdf83cb8b4..f932bb378f35 100644
--- a/net-analyzer/tcpslice/metadata.xml
+++ b/net-analyzer/tcpslice/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcpstat/metadata.xml b/net-analyzer/tcpstat/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/tcpstat/metadata.xml
+++ b/net-analyzer/tcpstat/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/tcptrace/metadata.xml
+++ b/net-analyzer/tcptrace/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcptraceroute/metadata.xml b/net-analyzer/tcptraceroute/metadata.xml
index a15be3b227b9..027df8340d8d 100644
--- a/net-analyzer/tcptraceroute/metadata.xml
+++ b/net-analyzer/tcptraceroute/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tcptrack/metadata.xml b/net-analyzer/tcptrack/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/tcptrack/metadata.xml
+++ b/net-analyzer/tcptrack/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
index c858951182ad..ffc44aeef678 100644
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/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>
+ <maintainer type="person">
<email>kensington@gentoo.org</email>
</maintainer>
<use>
diff --git a/net-analyzer/thc-ipv6/metadata.xml b/net-analyzer/thc-ipv6/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-analyzer/thc-ipv6/metadata.xml
+++ b/net-analyzer/thc-ipv6/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>
+<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/net-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/thcrut/metadata.xml
+++ b/net-analyzer/thcrut/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/thrulay/metadata.xml b/net-analyzer/thrulay/metadata.xml
index 0759bb9a19dd..7fb9c5a520e9 100644
--- a/net-analyzer/thrulay/metadata.xml
+++ b/net-analyzer/thrulay/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>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-analyzer/tleds/metadata.xml b/net-analyzer/tleds/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/tleds/metadata.xml
+++ b/net-analyzer/tleds/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tptest/metadata.xml b/net-analyzer/tptest/metadata.xml
index b07ac726d9ea..43601ae2ee47 100644
--- a/net-analyzer/tptest/metadata.xml
+++ b/net-analyzer/tptest/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml
index ea873d674628..e55d9843a684 100644
--- a/net-analyzer/tracebox/metadata.xml
+++ b/net-analyzer/tracebox/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml
index 9ca1b5e93d37..d46f35d35c2d 100644
--- a/net-analyzer/traceproto/metadata.xml
+++ b/net-analyzer/traceproto/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/traceroute-nanog/metadata.xml b/net-analyzer/traceroute-nanog/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/traceroute-nanog/metadata.xml
+++ b/net-analyzer/traceroute-nanog/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/traceroute/metadata.xml b/net-analyzer/traceroute/metadata.xml
index 2286f198e7fc..bdcc2fb0e8cf 100644
--- a/net-analyzer/traceroute/metadata.xml
+++ b/net-analyzer/traceroute/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/trafshow/metadata.xml b/net-analyzer/trafshow/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/trafshow/metadata.xml
+++ b/net-analyzer/trafshow/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/tsung/metadata.xml b/net-analyzer/tsung/metadata.xml
index 24cbb90cf0c4..40aa45df2b01 100644
--- a/net-analyzer/tsung/metadata.xml
+++ b/net-analyzer/tsung/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>
+ <maintainer type="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
diff --git a/net-analyzer/ttcp/metadata.xml b/net-analyzer/ttcp/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/ttcp/metadata.xml
+++ b/net-analyzer/ttcp/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/upnpscan/metadata.xml b/net-analyzer/upnpscan/metadata.xml
index 70dc193a83e6..87ebba397bfa 100644
--- a/net-analyzer/upnpscan/metadata.xml
+++ b/net-analyzer/upnpscan/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
index ec83004f63dd..dace7f2e8f57 100644
--- a/net-analyzer/vnstat/metadata.xml
+++ b/net-analyzer/vnstat/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
index 740d57b7b5b8..8871ae5f02f0 100644
--- a/net-analyzer/w3af/metadata.xml
+++ b/net-analyzer/w3af/metadata.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>clabbe.montjoie@gmail.com</email>
<name>LABBE Corentin (Montjoie)</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml
index 62cf68d6b70a..043a4b4f70a2 100644
--- a/net-analyzer/wapiti/metadata.xml
+++ b/net-analyzer/wapiti/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>
+ <maintainer type="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
diff --git a/net-analyzer/webfuzzer/metadata.xml b/net-analyzer/webfuzzer/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/webfuzzer/metadata.xml
+++ b/net-analyzer/webfuzzer/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index ae047c6f0334..4bd814015096 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/xnetload/metadata.xml b/net-analyzer/xnetload/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/xnetload/metadata.xml
+++ b/net-analyzer/xnetload/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/xprobe/metadata.xml b/net-analyzer/xprobe/metadata.xml
index fef0bbe355de..0552dd858870 100644
--- a/net-analyzer/xprobe/metadata.xml
+++ b/net-analyzer/xprobe/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>
+ <maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/yersinia/metadata.xml b/net-analyzer/yersinia/metadata.xml
index 1ac8c08887fd..a0e9a2ee4c47 100644
--- a/net-analyzer/yersinia/metadata.xml
+++ b/net-analyzer/yersinia/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>
diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 80fa589453eb..c337ab0177df 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/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>
+ <maintainer type="person">
<email>mattm@gentoo.org</email>
<name>Matthew Marlowe</name>
</maintainer>
diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 29e6ec5f9b73..7716af93b569 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/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>
+ <maintainer type="person">
<email>jlec@gentoo.org</email>
</maintainer>
<longdescription>
diff --git a/net-analyzer/zniper/metadata.xml b/net-analyzer/zniper/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-analyzer/zniper/metadata.xml
+++ b/net-analyzer/zniper/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>
+<maintainer type="project">
<email>netmon@gentoo.org</email>
<name>Gentoo network monitoring and analysis project</name>
</maintainer>