summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/adjtimex/metadata.xml2
-rw-r--r--net-misc/aget/metadata.xml2
-rw-r--r--net-misc/aggregate-flim/metadata.xml2
-rw-r--r--net-misc/aggregate/metadata.xml2
-rw-r--r--net-misc/aiccu/metadata.xml2
-rw-r--r--net-misc/apt-cacher-ng/metadata.xml4
-rw-r--r--net-misc/aria2/metadata.xml4
-rw-r--r--net-misc/arm/metadata.xml8
-rw-r--r--net-misc/arpd/metadata.xml2
-rw-r--r--net-misc/arpsponge/metadata.xml2
-rw-r--r--net-misc/asterisk-core-sounds/metadata.xml2
-rw-r--r--net-misc/asterisk-extra-sounds/metadata.xml2
-rw-r--r--net-misc/asterisk-g729/metadata.xml2
-rw-r--r--net-misc/asterisk-moh-opsound/metadata.xml2
-rw-r--r--net-misc/asterisk-rate_engine/metadata.xml2
-rw-r--r--net-misc/asterisk-spandsp_codec_g726/metadata.xml2
-rw-r--r--net-misc/asterisk/metadata.xml2
-rw-r--r--net-misc/astmanproxy/metadata.xml2
-rw-r--r--net-misc/autossh/metadata.xml2
-rw-r--r--net-misc/autoupnp/metadata.xml2
-rw-r--r--net-misc/axel/metadata.xml2
-rw-r--r--net-misc/badvpn/metadata.xml2
-rw-r--r--net-misc/balance/metadata.xml2
-rw-r--r--net-misc/batctl/metadata.xml2
-rw-r--r--net-misc/batman-adv/metadata.xml2
-rw-r--r--net-misc/bfgminer/metadata.xml4
-rw-r--r--net-misc/bgpq/metadata.xml2
-rw-r--r--net-misc/bgpq3/metadata.xml2
-rw-r--r--net-misc/bird/metadata.xml2
-rw-r--r--net-misc/bridge-utils/metadata.xml4
-rw-r--r--net-misc/bsdwhois/metadata.xml2
-rw-r--r--net-misc/bti/metadata.xml2
-rw-r--r--net-misc/bwwhois/metadata.xml4
-rw-r--r--net-misc/cadaver/metadata.xml4
-rw-r--r--net-misc/cbugzilla/metadata.xml2
-rw-r--r--net-misc/cfengine/metadata.xml6
-rw-r--r--net-misc/cgminer/metadata.xml6
-rw-r--r--net-misc/charm/metadata.xml2
-rw-r--r--net-misc/chrome-remote-desktop/metadata.xml2
-rw-r--r--net-misc/chrony/metadata.xml2
-rw-r--r--net-misc/clamz/metadata.xml2
-rw-r--r--net-misc/clipgrab/metadata.xml2
-rw-r--r--net-misc/clusterssh/metadata.xml2
-rw-r--r--net-misc/cmst/metadata.xml2
-rw-r--r--net-misc/cocaine-core/metadata.xml2
-rw-r--r--net-misc/connect/metadata.xml2
-rw-r--r--net-misc/connman-gtk/metadata.xml2
-rw-r--r--net-misc/connman-ui/metadata.xml2
-rw-r--r--net-misc/connman/metadata.xml6
-rw-r--r--net-misc/corkscrew/metadata.xml2
-rw-r--r--net-misc/csync/metadata.xml2
-rw-r--r--net-misc/curl/metadata.xml4
-rw-r--r--net-misc/dahdi-tools/metadata.xml2
-rw-r--r--net-misc/dahdi/metadata.xml2
-rw-r--r--net-misc/dcetest/metadata.xml2
-rw-r--r--net-misc/dhcdrop/metadata.xml6
-rw-r--r--net-misc/dhcp/metadata.xml2
-rw-r--r--net-misc/dhcpcd-ui/metadata.xml4
-rw-r--r--net-misc/dhcpcd/metadata.xml4
-rw-r--r--net-misc/dhcpd-pools/metadata.xml2
-rw-r--r--net-misc/dhcping/metadata.xml2
-rw-r--r--net-misc/dibbler/metadata.xml2
-rw-r--r--net-misc/directvnc/metadata.xml2
-rw-r--r--net-misc/dleyna-server/metadata.xml2
-rw-r--r--net-misc/dnetstats/metadata.xml2
-rw-r--r--net-misc/dropbear/metadata.xml2
-rw-r--r--net-misc/dropbox-cli/metadata.xml2
-rw-r--r--net-misc/dropbox/metadata.xml2
-rw-r--r--net-misc/electrum/metadata.xml10
-rw-r--r--net-misc/elliptics-eblob/metadata.xml2
-rw-r--r--net-misc/elliptics/metadata.xml2
-rw-r--r--net-misc/ethercard-diag/metadata.xml2
-rw-r--r--net-misc/exabgp/metadata.xml2
-rw-r--r--net-misc/fatrat/metadata.xml2
-rw-r--r--net-misc/flexget/metadata.xml2
-rw-r--r--net-misc/freerdp/metadata.xml2
-rw-r--r--net-misc/geoipupdate/metadata.xml2
-rw-r--r--net-misc/geomyidae/metadata.xml2
-rw-r--r--net-misc/gnome-online-miners/metadata.xml2
-rw-r--r--net-misc/gnome-rdp/metadata.xml2
-rw-r--r--net-misc/gns3-converter/metadata.xml2
-rw-r--r--net-misc/gns3-gui/metadata.xml2
-rw-r--r--net-misc/gns3-server/metadata.xml2
-rw-r--r--net-misc/gofish/metadata.xml2
-rw-r--r--net-misc/gogoc/metadata.xml2
-rw-r--r--net-misc/googlecl/metadata.xml2
-rw-r--r--net-misc/grdesktop/metadata.xml2
-rw-r--r--net-misc/grive/metadata.xml2
-rw-r--r--net-misc/gsasl/metadata.xml2
-rw-r--r--net-misc/gsutil/metadata.xml2
-rw-r--r--net-misc/gtkvncviewer/metadata.xml2
-rw-r--r--net-misc/guacamole-server/metadata.xml2
-rw-r--r--net-misc/gupnp-tools/metadata.xml2
-rw-r--r--net-misc/gvrpcd/metadata.xml6
-rw-r--r--net-misc/gwget/metadata.xml2
-rw-r--r--net-misc/gwhois/metadata.xml2
-rw-r--r--net-misc/haeredes/metadata.xml2
-rw-r--r--net-misc/hath/metadata.xml2
-rw-r--r--net-misc/hotot/metadata.xml2
-rw-r--r--net-misc/hsc/metadata.xml2
-rw-r--r--net-misc/htpdate/metadata.xml2
-rw-r--r--net-misc/httpie/metadata.xml2
-rw-r--r--net-misc/httptype/metadata.xml2
-rw-r--r--net-misc/hylafaxplus/metadata.xml2
-rw-r--r--net-misc/i2pd/metadata.xml4
-rw-r--r--net-misc/icaclient/metadata.xml2
-rw-r--r--net-misc/icecast/metadata.xml2
-rw-r--r--net-misc/ices/metadata.xml2
-rw-r--r--net-misc/ifenslave/metadata.xml4
-rw-r--r--net-misc/iodine/metadata.xml8
-rw-r--r--net-misc/ip-sentinel/metadata.xml2
-rw-r--r--net-misc/ipcalc/metadata.xml2
-rw-r--r--net-misc/iperf/metadata.xml2
-rw-r--r--net-misc/iprange/metadata.xml2
-rw-r--r--net-misc/ipsc/metadata.xml2
-rw-r--r--net-misc/iputils/metadata.xml2
-rw-r--r--net-misc/ipv6calc/metadata.xml6
-rw-r--r--net-misc/isatapd/metadata.xml2
-rw-r--r--net-misc/ixp4xx/metadata.xml4
-rw-r--r--net-misc/java-wakeonlan/metadata.xml2
-rw-r--r--net-misc/jrdesktop/metadata.xml2
-rw-r--r--net-misc/jwhois/metadata.xml2
-rw-r--r--net-misc/kea/metadata.xml4
-rw-r--r--net-misc/keychain/metadata.xml6
-rw-r--r--net-misc/knemo/metadata.xml2
-rw-r--r--net-misc/knock/metadata.xml2
-rw-r--r--net-misc/knutclient/metadata.xml2
-rw-r--r--net-misc/ksshaskpass/metadata.xml2
-rw-r--r--net-misc/kvpnc/metadata.xml2
-rw-r--r--net-misc/l7-filter-userspace/metadata.xml2
-rw-r--r--net-misc/l7-protocols/metadata.xml2
-rw-r--r--net-misc/lanmap/metadata.xml2
-rw-r--r--net-misc/lcr/metadata.xml2
-rw-r--r--net-misc/leapcast/metadata.xml2
-rw-r--r--net-misc/libres3/metadata.xml6
-rw-r--r--net-misc/libreswan/metadata.xml2
-rw-r--r--net-misc/libss7/metadata.xml2
-rw-r--r--net-misc/linux-eoip/metadata.xml6
-rw-r--r--net-misc/linuxptp/metadata.xml2
-rw-r--r--net-misc/livestreamer/metadata.xml4
-rw-r--r--net-misc/lksctp-tools/metadata.xml6
-rw-r--r--net-misc/lldpd/metadata.xml2
-rw-r--r--net-misc/logmein-hamachi/metadata.xml4
-rw-r--r--net-misc/mediatomb/metadata.xml4
-rw-r--r--net-misc/megatools/metadata.xml2
-rw-r--r--net-misc/memcached/metadata.xml4
-rw-r--r--net-misc/mico/metadata.xml2
-rw-r--r--net-misc/mikutter/metadata.xml2
-rw-r--r--net-misc/mindterm/metadata.xml2
-rw-r--r--net-misc/minidlna/metadata.xml2
-rw-r--r--net-misc/minissdpd/metadata.xml2
-rw-r--r--net-misc/miniupnpd/metadata.xml2
-rw-r--r--net-misc/miredo/metadata.xml4
-rw-r--r--net-misc/mobile-broadband-provider-info/metadata.xml2
-rw-r--r--net-misc/modemmanager/metadata.xml2
-rw-r--r--net-misc/mosh/metadata.xml4
-rw-r--r--net-misc/mulk/metadata.xml2
-rw-r--r--net-misc/nat-traverse/metadata.xml2
-rw-r--r--net-misc/ncp/metadata.xml2
-rw-r--r--net-misc/ndisc6/metadata.xml2
-rw-r--r--net-misc/ndppd/metadata.xml2
-rw-r--r--net-misc/nemesis/metadata.xml4
-rw-r--r--net-misc/netctl/metadata.xml4
-rw-r--r--net-misc/netdate/metadata.xml2
-rw-r--r--net-misc/netfleet/metadata.xml2
-rw-r--r--net-misc/netifrc/metadata.xml2
-rw-r--r--net-misc/netkit-bootparamd/metadata.xml2
-rw-r--r--net-misc/netkit-bootpd/metadata.xml2
-rw-r--r--net-misc/netkit-fingerd/metadata.xml2
-rw-r--r--net-misc/netkit-rsh/metadata.xml2
-rw-r--r--net-misc/netkit-rwho/metadata.xml2
-rw-r--r--net-misc/netpipes/metadata.xml2
-rw-r--r--net-misc/netstat-nat/metadata.xml2
-rw-r--r--net-misc/networkmanager-openconnect/metadata.xml4
-rw-r--r--net-misc/networkmanager-openswan/metadata.xml4
-rw-r--r--net-misc/networkmanager-openvpn/metadata.xml4
-rw-r--r--net-misc/networkmanager-pptp/metadata.xml4
-rw-r--r--net-misc/networkmanager-sstp/metadata.xml6
-rw-r--r--net-misc/networkmanager-vpnc/metadata.xml4
-rw-r--r--net-misc/networkmanager/metadata.xml2
-rw-r--r--net-misc/npapi-sdk/metadata.xml6
-rw-r--r--net-misc/nstx/metadata.xml2
-rw-r--r--net-misc/ntp/metadata.xml2
-rw-r--r--net-misc/ntpclient/metadata.xml2
-rw-r--r--net-misc/nx/metadata.xml2
-rw-r--r--net-misc/nxplayer/metadata.xml2
-rw-r--r--net-misc/ocsync/metadata.xml2
-rw-r--r--net-misc/ofono/metadata.xml2
-rw-r--r--net-misc/oidentd/metadata.xml2
-rw-r--r--net-misc/olsrd/metadata.xml2
-rw-r--r--net-misc/omniORB/metadata.xml2
-rw-r--r--net-misc/openconnect/metadata.xml6
-rw-r--r--net-misc/openntpd/metadata.xml6
-rw-r--r--net-misc/openr2/metadata.xml2
-rw-r--r--net-misc/openrdate/metadata.xml2
-rw-r--r--net-misc/openssh-blacklist/metadata.xml2
-rw-r--r--net-misc/openssh/metadata.xml4
-rw-r--r--net-misc/openvpn-auth-ldap/metadata.xml2
-rw-r--r--net-misc/openvpn/metadata.xml2
-rw-r--r--net-misc/openvswitch/metadata.xml6
-rw-r--r--net-misc/owncloud-client/metadata.xml2
-rw-r--r--net-misc/packETH/metadata.xml2
-rw-r--r--net-misc/pavuk/metadata.xml6
-rw-r--r--net-misc/pcapfix/metadata.xml2
-rw-r--r--net-misc/pedro/metadata.xml2
-rw-r--r--net-misc/pipes/metadata.xml2
-rw-r--r--net-misc/plowshare/metadata.xml2
-rw-r--r--net-misc/pmsvn/metadata.xml2
-rw-r--r--net-misc/polly/metadata.xml4
-rw-r--r--net-misc/portspoof/metadata.xml2
-rw-r--r--net-misc/pps-tools/metadata.xml2
-rw-r--r--net-misc/proxychains/metadata.xml2
-rw-r--r--net-misc/proxytunnel/metadata.xml2
-rw-r--r--net-misc/ps3mediaserver/metadata.xml4
-rw-r--r--net-misc/pssh/metadata.xml2
-rw-r--r--net-misc/ptpd/metadata.xml4
-rw-r--r--net-misc/putty/metadata.xml2
-rw-r--r--net-misc/pycnb/metadata.xml4
-rw-r--r--net-misc/pyhoca-cli/metadata.xml2
-rw-r--r--net-misc/pyhoca-gui/metadata.xml2
-rw-r--r--net-misc/pymazon/metadata.xml2
-rw-r--r--net-misc/python-x2go/metadata.xml2
-rw-r--r--net-misc/qtm/metadata.xml4
-rw-r--r--net-misc/quagga/metadata.xml2
-rw-r--r--net-misc/quickshare/metadata.xml2
-rw-r--r--net-misc/r8168/metadata.xml2
-rw-r--r--net-misc/rabbitmq-server/metadata.xml2
-rw-r--r--net-misc/radvd/metadata.xml4
-rw-r--r--net-misc/rancid-git/metadata.xml4
-rw-r--r--net-misc/rancid/metadata.xml6
-rw-r--r--net-misc/rdate/metadata.xml2
-rw-r--r--net-misc/rdesktop/metadata.xml2
-rw-r--r--net-misc/redir/metadata.xml4
-rw-r--r--net-misc/remmina/metadata.xml2
-rw-r--r--net-misc/ris-linux/metadata.xml2
-rw-r--r--net-misc/rsync/metadata.xml2
-rw-r--r--net-misc/rygel/metadata.xml2
-rw-r--r--net-misc/s3cmd/metadata.xml6
-rw-r--r--net-misc/samplicator/metadata.xml4
-rw-r--r--net-misc/secpanel/metadata.xml2
-rw-r--r--net-misc/ser2net/metadata.xml4
-rw-r--r--net-misc/sgopherd/metadata.xml2
-rw-r--r--net-misc/shmux/metadata.xml2
-rw-r--r--net-misc/shout/metadata.xml2
-rw-r--r--net-misc/sipsak/metadata.xml2
-rw-r--r--net-misc/sitecopy/metadata.xml4
-rw-r--r--net-misc/sks/metadata.xml2
-rw-r--r--net-misc/slimrat/metadata.xml4
-rw-r--r--net-misc/smb4k/metadata.xml2
-rw-r--r--net-misc/smbc/metadata.xml2
-rw-r--r--net-misc/sobby/metadata.xml2
-rw-r--r--net-misc/socat/metadata.xml2
-rw-r--r--net-misc/socket/metadata.xml2
-rw-r--r--net-misc/spice-gtk/metadata.xml4
-rw-r--r--net-misc/spiped/metadata.xml2
-rw-r--r--net-misc/ssh-askpass-fullscreen/metadata.xml2
-rw-r--r--net-misc/ssh-chain/metadata.xml2
-rw-r--r--net-misc/sshpass/metadata.xml6
-rw-r--r--net-misc/sslh/metadata.xml2
-rw-r--r--net-misc/sstp-client/metadata.xml8
-rw-r--r--net-misc/ssvnc/metadata.xml2
-rw-r--r--net-misc/stargazer/metadata.xml4
-rw-r--r--net-misc/streamtuner/metadata.xml2
-rw-r--r--net-misc/strongswan/metadata.xml4
-rw-r--r--net-misc/stunnel/metadata.xml2
-rw-r--r--net-misc/stuntman/metadata.xml2
-rw-r--r--net-misc/suite3270/metadata.xml8
-rw-r--r--net-misc/switzerland/metadata.xml2
-rw-r--r--net-misc/sx/metadata.xml4
-rw-r--r--net-misc/tcpsound/metadata.xml2
-rw-r--r--net-misc/teamviewer/metadata.xml6
-rw-r--r--net-misc/telnet-bsd/metadata.xml2
-rw-r--r--net-misc/termtter/metadata.xml2
-rw-r--r--net-misc/throttle/metadata.xml2
-rw-r--r--net-misc/tiers/metadata.xml2
-rw-r--r--net-misc/tigervnc/metadata.xml2
-rw-r--r--net-misc/tightvnc/metadata.xml2
-rw-r--r--net-misc/tinc/metadata.xml4
-rw-r--r--net-misc/tipcutils/metadata.xml4
-rw-r--r--net-misc/tlsdate/metadata.xml2
-rw-r--r--net-misc/tn5250/metadata.xml2
-rw-r--r--net-misc/tokyotyrant/metadata.xml2
-rw-r--r--net-misc/tor/metadata.xml2
-rw-r--r--net-misc/ttytter/metadata.xml2
-rw-r--r--net-misc/ucarp/metadata.xml2
-rw-r--r--net-misc/udpcast/metadata.xml2
-rw-r--r--net-misc/uftp/metadata.xml4
-rw-r--r--net-misc/unison/metadata.xml2
-rw-r--r--net-misc/urlview/metadata.xml2
-rw-r--r--net-misc/usbip/metadata.xml2
-rw-r--r--net-misc/valve/metadata.xml2
-rw-r--r--net-misc/vconfig/metadata.xml2
-rw-r--r--net-misc/vde/metadata.xml8
-rw-r--r--net-misc/vinagre/metadata.xml2
-rw-r--r--net-misc/vino/metadata.xml2
-rw-r--r--net-misc/vmnet/metadata.xml2
-rw-r--r--net-misc/vmpsd/metadata.xml2
-rw-r--r--net-misc/vpnc/metadata.xml6
-rw-r--r--net-misc/vpncwatch/metadata.xml2
-rw-r--r--net-misc/vrrpd/metadata.xml2
-rw-r--r--net-misc/vtun/metadata.xml2
-rw-r--r--net-misc/wakeonlan/metadata.xml2
-rw-r--r--net-misc/wget/metadata.xml2
-rw-r--r--net-misc/whatmask/metadata.xml2
-rw-r--r--net-misc/whois/metadata.xml2
-rw-r--r--net-misc/wicd/metadata.xml2
-rw-r--r--net-misc/wol/metadata.xml2
-rw-r--r--net-misc/wput/metadata.xml2
-rw-r--r--net-misc/x11-ssh-askpass/metadata.xml2
-rw-r--r--net-misc/x11rdp/metadata.xml2
-rw-r--r--net-misc/x2goclient/metadata.xml2
-rw-r--r--net-misc/x2goserver/metadata.xml2
-rw-r--r--net-misc/xrdp/metadata.xml2
-rw-r--r--net-misc/yajhfc/metadata.xml2
-rw-r--r--net-misc/yandex-disk/metadata.xml6
-rw-r--r--net-misc/youtube-dl/metadata.xml4
-rw-r--r--net-misc/youtube-viewer/metadata.xml4
-rw-r--r--net-misc/ytalk/metadata.xml4
-rw-r--r--net-misc/zssh/metadata.xml4
-rw-r--r--net-misc/zsync/metadata.xml2
320 files changed, 433 insertions, 433 deletions
diff --git a/net-misc/adjtimex/metadata.xml b/net-misc/adjtimex/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/adjtimex/metadata.xml
+++ b/net-misc/adjtimex/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-misc/aget/metadata.xml b/net-misc/aget/metadata.xml
index 7026f2a9f3c1..8fa258745ec4 100644
--- a/net-misc/aget/metadata.xml
+++ b/net-misc/aget/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-misc/aggregate-flim/metadata.xml b/net-misc/aggregate-flim/metadata.xml
index 967fdca5659a..92c124322a5d 100644
--- a/net-misc/aggregate-flim/metadata.xml
+++ b/net-misc/aggregate-flim/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>
<longdescription>aggregate is a tool for aggregating CIDR networks. Input is read from stdin and output is written to stdout. It undestands IPv4 networks represented as network/prefix, network/netmask and start_address - end_addres. It is able to read input in any one of these formats and output in the same or a different format.</longdescription>
diff --git a/net-misc/aggregate/metadata.xml b/net-misc/aggregate/metadata.xml
index 425b0dbd3a80..fa0367d8f9ea 100644
--- a/net-misc/aggregate/metadata.xml
+++ b/net-misc/aggregate/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>
<longdescription>aggregate is a tool for aggregating CIDR networks. Input is read from stdin and output is written to stdout. It understands IPv4 networks represented as network/prefix, network/netmask and start_address - end_address. It is able to read input in any one of these formats and output in the same or a different format.</longdescription>
diff --git a/net-misc/aiccu/metadata.xml b/net-misc/aiccu/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-misc/aiccu/metadata.xml
+++ b/net-misc/aiccu/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-misc/apt-cacher-ng/metadata.xml b/net-misc/apt-cacher-ng/metadata.xml
index c870f4812601..88aef1304357 100644
--- a/net-misc/apt-cacher-ng/metadata.xml
+++ b/net-misc/apt-cacher-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>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>deb-tools@gentoo.org</email>
<name>Gentoo Debian Tools Project</name>
</maintainer>
diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index 1079971424d5..18fb229e976f 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/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>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/net-misc/arm/metadata.xml b/net-misc/arm/metadata.xml
index 3449cfe1d8ce..30b48ef12104 100644
--- a/net-misc/arm/metadata.xml
+++ b/net-misc/arm/metadata.xml
@@ -1,19 +1,19 @@
<?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>
- <maintainer>
+ <maintainer type="person">
<email>jesse@boldandbusted.com</email>
<name>Jesse Adelman</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/arpd/metadata.xml b/net-misc/arpd/metadata.xml
index 243b1ca9f63a..3c3d5ced6412 100644
--- a/net-misc/arpd/metadata.xml
+++ b/net-misc/arpd/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-misc/arpsponge/metadata.xml b/net-misc/arpsponge/metadata.xml
index 3ed4669f55a4..5087760546f6 100644
--- a/net-misc/arpsponge/metadata.xml
+++ b/net-misc/arpsponge/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-misc/asterisk-core-sounds/metadata.xml b/net-misc/asterisk-core-sounds/metadata.xml
index e9e074098f0a..bfadac6d6ff8 100644
--- a/net-misc/asterisk-core-sounds/metadata.xml
+++ b/net-misc/asterisk-core-sounds/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-misc/asterisk-extra-sounds/metadata.xml b/net-misc/asterisk-extra-sounds/metadata.xml
index a2a28b936d0e..7413756723d5 100644
--- a/net-misc/asterisk-extra-sounds/metadata.xml
+++ b/net-misc/asterisk-extra-sounds/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-misc/asterisk-g729/metadata.xml b/net-misc/asterisk-g729/metadata.xml
index 3ed4669f55a4..5087760546f6 100644
--- a/net-misc/asterisk-g729/metadata.xml
+++ b/net-misc/asterisk-g729/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-misc/asterisk-moh-opsound/metadata.xml b/net-misc/asterisk-moh-opsound/metadata.xml
index a2a28b936d0e..7413756723d5 100644
--- a/net-misc/asterisk-moh-opsound/metadata.xml
+++ b/net-misc/asterisk-moh-opsound/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-misc/asterisk-rate_engine/metadata.xml b/net-misc/asterisk-rate_engine/metadata.xml
index 1db71bb6e0e4..c10b09fa8f36 100644
--- a/net-misc/asterisk-rate_engine/metadata.xml
+++ b/net-misc/asterisk-rate_engine/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>chainsaw@gentoo.org</email></maintainer>
+<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/net-misc/asterisk-spandsp_codec_g726/metadata.xml b/net-misc/asterisk-spandsp_codec_g726/metadata.xml
index 8479914d0c45..0e2180602d8c 100644
--- a/net-misc/asterisk-spandsp_codec_g726/metadata.xml
+++ b/net-misc/asterisk-spandsp_codec_g726/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><email>chainsaw@gentoo.org</email></maintainer>
+<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
<longdescription lang="en">
SpanDSP ITU G.726-32kbps codec for Asterisk. It's a replacement
for Asterisk's own G.726 codec, which isn't fully compliant to
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index dd374a53ea13..706fd135420b 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/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-misc/astmanproxy/metadata.xml b/net-misc/astmanproxy/metadata.xml
index 15557bab0515..32b67186d84f 100644
--- a/net-misc/astmanproxy/metadata.xml
+++ b/net-misc/astmanproxy/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>
</maintainer>
<upstream>
diff --git a/net-misc/autossh/metadata.xml b/net-misc/autossh/metadata.xml
index 157326a7e891..78e64a5cf1ad 100644
--- a/net-misc/autossh/metadata.xml
+++ b/net-misc/autossh/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>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/net-misc/autoupnp/metadata.xml b/net-misc/autoupnp/metadata.xml
index 1ceb5b062490..527c08acfeae 100644
--- a/net-misc/autoupnp/metadata.xml
+++ b/net-misc/autoupnp/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/net-misc/axel/metadata.xml b/net-misc/axel/metadata.xml
index c845479d513e..7b2095db0742 100644
--- a/net-misc/axel/metadata.xml
+++ b/net-misc/axel/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>
</pkgmetadata>
diff --git a/net-misc/badvpn/metadata.xml b/net-misc/badvpn/metadata.xml
index 500e2752217e..e2a7803599c3 100644
--- a/net-misc/badvpn/metadata.xml
+++ b/net-misc/badvpn/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>williamh@gentoo.org</email>
<description>backup Maintainer, CC him on bugs</description>
</maintainer>
diff --git a/net-misc/balance/metadata.xml b/net-misc/balance/metadata.xml
index 243b1ca9f63a..3c3d5ced6412 100644
--- a/net-misc/balance/metadata.xml
+++ b/net-misc/balance/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-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-misc/batctl/metadata.xml
+++ b/net-misc/batctl/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-misc/batman-adv/metadata.xml b/net-misc/batman-adv/metadata.xml
index e9ea16a10590..dd744838a0ec 100644
--- a/net-misc/batman-adv/metadata.xml
+++ b/net-misc/batman-adv/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-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index 49d6f9a9be79..aa456e90bcef 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/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>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
diff --git a/net-misc/bgpq/metadata.xml b/net-misc/bgpq/metadata.xml
index 0d6e4e2054d6..937891f05135 100644
--- a/net-misc/bgpq/metadata.xml
+++ b/net-misc/bgpq/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/bgpq3/metadata.xml b/net-misc/bgpq3/metadata.xml
index 1e87335024ff..7a58fa4de8f9 100644
--- a/net-misc/bgpq3/metadata.xml
+++ b/net-misc/bgpq3/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/bird/metadata.xml b/net-misc/bird/metadata.xml
index 7803cdb58252..1a06e96ebdc7 100644
--- a/net-misc/bird/metadata.xml
+++ b/net-misc/bird/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-misc/bridge-utils/metadata.xml b/net-misc/bridge-utils/metadata.xml
index b5111b4fa108..995aec82049e 100644
--- a/net-misc/bridge-utils/metadata.xml
+++ b/net-misc/bridge-utils/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/bsdwhois/metadata.xml b/net-misc/bsdwhois/metadata.xml
index d7caf7d3b1d4..a00f3aeb1f81 100644
--- a/net-misc/bsdwhois/metadata.xml
+++ b/net-misc/bsdwhois/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-misc/bti/metadata.xml b/net-misc/bti/metadata.xml
index b14c9fbb1755..9c5ed222d2ec 100644
--- a/net-misc/bti/metadata.xml
+++ b/net-misc/bti/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>gregkh@gentoo.org</email>
<name>Greg Kroah-Hartman</name>
</maintainer>
diff --git a/net-misc/bwwhois/metadata.xml b/net-misc/bwwhois/metadata.xml
index 1b9fb5b7d4b0..2cb7edde3a31 100644
--- a/net-misc/bwwhois/metadata.xml
+++ b/net-misc/bwwhois/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>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index 5707ccd14517..c2d1a82c0e89 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/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>arfrever.fta@gmail.com</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/cbugzilla/metadata.xml b/net-misc/cbugzilla/metadata.xml
index 79f0d33aa259..c08f704e03c8 100644
--- a/net-misc/cbugzilla/metadata.xml
+++ b/net-misc/cbugzilla/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>yac@gentoo.org</email>
<name>Jan Matejka</name>
</maintainer>
diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index 717ab7f7f42f..a5b3d7e3b60c 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/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>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
<description>cfengine 2.x only</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mschiff@gentoo.org</email>
<name>Marc Schiffbauer</name>
<description>cfengine &gt;2.x only</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
</maintainer>
diff --git a/net-misc/cgminer/metadata.xml b/net-misc/cgminer/metadata.xml
index 812227cb9e38..63b6b39db638 100644
--- a/net-misc/cgminer/metadata.xml
+++ b/net-misc/cgminer/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>ki@baka.bakka.su</email>
<description>In baka-bakka overlay.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/charm/metadata.xml b/net-misc/charm/metadata.xml
index 601134e0f976..1dbab67f61cd 100644
--- a/net-misc/charm/metadata.xml
+++ b/net-misc/charm/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>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml
index 7123fa8f9ece..1021f53d6e8c 100644
--- a/net-misc/chrome-remote-desktop/metadata.xml
+++ b/net-misc/chrome-remote-desktop/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>vapier@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 99f83c647fda..0a98e63dee79 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/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>jer@gentoo.org</email>
</maintainer>
<longdescription>
diff --git a/net-misc/clamz/metadata.xml b/net-misc/clamz/metadata.xml
index 9f9ded9f39a5..c45f7480f578 100644
--- a/net-misc/clamz/metadata.xml
+++ b/net-misc/clamz/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>desktop-misc@gentoo.org</email>
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
diff --git a/net-misc/clipgrab/metadata.xml b/net-misc/clipgrab/metadata.xml
index 58a826b66ff9..d15a3ebeaa10 100644
--- a/net-misc/clipgrab/metadata.xml
+++ b/net-misc/clipgrab/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-misc/clusterssh/metadata.xml b/net-misc/clusterssh/metadata.xml
index 7e42e9a3baed..bdf9d1cea7b1 100644
--- a/net-misc/clusterssh/metadata.xml
+++ b/net-misc/clusterssh/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>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
</maintainer>
diff --git a/net-misc/cmst/metadata.xml b/net-misc/cmst/metadata.xml
index 77b82cf8aac7..2529600a4fbd 100644
--- a/net-misc/cmst/metadata.xml
+++ b/net-misc/cmst/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-misc/cocaine-core/metadata.xml b/net-misc/cocaine-core/metadata.xml
index 67ee8b27ff2a..13f626e87155 100644
--- a/net-misc/cocaine-core/metadata.xml
+++ b/net-misc/cocaine-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="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
diff --git a/net-misc/connect/metadata.xml b/net-misc/connect/metadata.xml
index 5938ebe814ca..2f7884dc6edd 100644
--- a/net-misc/connect/metadata.xml
+++ b/net-misc/connect/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>wschlich@gentoo.org</email>
<name>Wolfram Schlich</name>
<description>Primary maintainer</description>
diff --git a/net-misc/connman-gtk/metadata.xml b/net-misc/connman-gtk/metadata.xml
index 00940010b5a5..09bef32083cb 100644
--- a/net-misc/connman-gtk/metadata.xml
+++ b/net-misc/connman-gtk/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>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
</maintainer>
diff --git a/net-misc/connman-ui/metadata.xml b/net-misc/connman-ui/metadata.xml
index 349fc1408b6c..394644abafd8 100644
--- a/net-misc/connman-ui/metadata.xml
+++ b/net-misc/connman-ui/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>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
</maintainer>
diff --git a/net-misc/connman/metadata.xml b/net-misc/connman/metadata.xml
index b5f1baa10e9c..54b2eac407c3 100644
--- a/net-misc/connman/metadata.xml
+++ b/net-misc/connman/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>balint@szentedwg.ro</email>
<name>Bálint Szente</name>
<description>Primary Maintainer, Assign bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>dlan@gentoo.org</email>
<name>Yixun Lan</name>
<description>Co Maintainer, CC bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/corkscrew/metadata.xml b/net-misc/corkscrew/metadata.xml
index 5f1a4d657dde..306c354edf5b 100644
--- a/net-misc/corkscrew/metadata.xml
+++ b/net-misc/corkscrew/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-misc/csync/metadata.xml b/net-misc/csync/metadata.xml
index f713f2a74b47..4ce4054df697 100644
--- a/net-misc/csync/metadata.xml
+++ b/net-misc/csync/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-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index e0695ccfdf9a..fcb331819d42 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/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>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>gregkh@gentoo.org</email>
<name>Greg Kroah-Hartman</name>
</maintainer>
diff --git a/net-misc/dahdi-tools/metadata.xml b/net-misc/dahdi-tools/metadata.xml
index 2cfe9ff5a1e3..42f88a34db7c 100644
--- a/net-misc/dahdi-tools/metadata.xml
+++ b/net-misc/dahdi-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>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
diff --git a/net-misc/dahdi/metadata.xml b/net-misc/dahdi/metadata.xml
index 09b2235129ec..f804fe3a2199 100644
--- a/net-misc/dahdi/metadata.xml
+++ b/net-misc/dahdi/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-misc/dcetest/metadata.xml b/net-misc/dcetest/metadata.xml
index dc267bfe85d6..8d1c5a827b9d 100644
--- a/net-misc/dcetest/metadata.xml
+++ b/net-misc/dcetest/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>
<longdescription>This little utility dumps MSRPC endpoint information from
diff --git a/net-misc/dhcdrop/metadata.xml b/net-misc/dhcdrop/metadata.xml
index 4d33617f0794..201ea4947cad 100644
--- a/net-misc/dhcdrop/metadata.xml
+++ b/net-misc/dhcdrop/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>spiderx@spiderx.dp.ua</email>
<name>Vladimir Pavljuchenkov</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</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-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
index 206e82b6874a..ec94f20ac1f1 100644
--- a/net-misc/dhcp/metadata.xml
+++ b/net-misc/dhcp/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/dhcpcd-ui/metadata.xml b/net-misc/dhcpcd-ui/metadata.xml
index f31ffbf8641d..08e902a88a8f 100644
--- a/net-misc/dhcpcd-ui/metadata.xml
+++ b/net-misc/dhcpcd-ui/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>tokiclover@gmail.com</email>
<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-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index 308e6e3a0e25..20cbfc65739c 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/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>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/dhcpd-pools/metadata.xml b/net-misc/dhcpd-pools/metadata.xml
index fc319ce95c0c..8577945b03ba 100644
--- a/net-misc/dhcpd-pools/metadata.xml
+++ b/net-misc/dhcpd-pools/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>cardoe@gentoo.org</email>
<name>Doug Goldstein</name>
</maintainer>
diff --git a/net-misc/dhcping/metadata.xml b/net-misc/dhcping/metadata.xml
index c331b7a5bba4..1e878c532c32 100644
--- a/net-misc/dhcping/metadata.xml
+++ b/net-misc/dhcping/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>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/dibbler/metadata.xml b/net-misc/dibbler/metadata.xml
index ea02039c8d10..7d273a80ff68 100644
--- a/net-misc/dibbler/metadata.xml
+++ b/net-misc/dibbler/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-misc/directvnc/metadata.xml b/net-misc/directvnc/metadata.xml
index 071297add332..59570dd884e1 100644
--- a/net-misc/directvnc/metadata.xml
+++ b/net-misc/directvnc/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/net-misc/dleyna-server/metadata.xml b/net-misc/dleyna-server/metadata.xml
index d27adefecf34..996e7cacd217 100644
--- a/net-misc/dleyna-server/metadata.xml
+++ b/net-misc/dleyna-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>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-misc/dnetstats/metadata.xml b/net-misc/dnetstats/metadata.xml
index 4f773f3cebf0..32fe1293e9a9 100644
--- a/net-misc/dnetstats/metadata.xml
+++ b/net-misc/dnetstats/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-misc/dropbear/metadata.xml b/net-misc/dropbear/metadata.xml
index b57924f9b147..5133c5c348b6 100644
--- a/net-misc/dropbear/metadata.xml
+++ b/net-misc/dropbear/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>embedded@gentoo.org</email>
<name>Embedded Gentoo</name>
</maintainer>
diff --git a/net-misc/dropbox-cli/metadata.xml b/net-misc/dropbox-cli/metadata.xml
index bebd69f042be..13830225acf7 100644
--- a/net-misc/dropbox-cli/metadata.xml
+++ b/net-misc/dropbox-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>grozin@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/dropbox/metadata.xml b/net-misc/dropbox/metadata.xml
index 42714a4dadd3..4b902f3f34b4 100644
--- a/net-misc/dropbox/metadata.xml
+++ b/net-misc/dropbox/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>naota@gentoo.org</email>
</maintainer>
<use>
diff --git a/net-misc/electrum/metadata.xml b/net-misc/electrum/metadata.xml
index 95879f1c01d4..587655f9ccac 100644
--- a/net-misc/electrum/metadata.xml
+++ b/net-misc/electrum/metadata.xml
@@ -1,23 +1,23 @@
<?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>
- <maintainer>
+ <maintainer type="person">
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>maksverver@geocities.com</email>
<name>Maks Verver</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>emery@vfemail.net</email>
<name>Emery Hemingway</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/elliptics-eblob/metadata.xml b/net-misc/elliptics-eblob/metadata.xml
index 43acb2cc82ef..6243741ac580 100644
--- a/net-misc/elliptics-eblob/metadata.xml
+++ b/net-misc/elliptics-eblob/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-misc/elliptics/metadata.xml b/net-misc/elliptics/metadata.xml
index 783c4d3a16c5..724365e3d382 100644
--- a/net-misc/elliptics/metadata.xml
+++ b/net-misc/elliptics/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-misc/ethercard-diag/metadata.xml b/net-misc/ethercard-diag/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/net-misc/ethercard-diag/metadata.xml
+++ b/net-misc/ethercard-diag/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/exabgp/metadata.xml b/net-misc/exabgp/metadata.xml
index 9d6cb653b38a..019082130680 100644
--- a/net-misc/exabgp/metadata.xml
+++ b/net-misc/exabgp/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-misc/fatrat/metadata.xml b/net-misc/fatrat/metadata.xml
index 6a8f28deddb3..a025d6c4d8f9 100644
--- a/net-misc/fatrat/metadata.xml
+++ b/net-misc/fatrat/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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
diff --git a/net-misc/flexget/metadata.xml b/net-misc/flexget/metadata.xml
index a2ce09f19ce9..851d3e21be08 100644
--- a/net-misc/flexget/metadata.xml
+++ b/net-misc/flexget/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
diff --git a/net-misc/freerdp/metadata.xml b/net-misc/freerdp/metadata.xml
index cf9652841d21..e630a37f0a21 100644
--- a/net-misc/freerdp/metadata.xml
+++ b/net-misc/freerdp/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
diff --git a/net-misc/geoipupdate/metadata.xml b/net-misc/geoipupdate/metadata.xml
index 7574996a6f39..77e4137ec885 100644
--- a/net-misc/geoipupdate/metadata.xml
+++ b/net-misc/geoipupdate/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-misc/geomyidae/metadata.xml b/net-misc/geomyidae/metadata.xml
index b6b8956cde34..5b159fbcadd1 100644
--- a/net-misc/geomyidae/metadata.xml
+++ b/net-misc/geomyidae/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/gnome-online-miners/metadata.xml b/net-misc/gnome-online-miners/metadata.xml
index e12aaf03d9a1..16c433dd2cb5 100644
--- a/net-misc/gnome-online-miners/metadata.xml
+++ b/net-misc/gnome-online-miners/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-misc/gnome-rdp/metadata.xml b/net-misc/gnome-rdp/metadata.xml
index 4ae5dc419018..4965c206c652 100644
--- a/net-misc/gnome-rdp/metadata.xml
+++ b/net-misc/gnome-rdp/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-misc/gns3-converter/metadata.xml b/net-misc/gns3-converter/metadata.xml
index 1ea66e6f8ebb..477445318b25 100644
--- a/net-misc/gns3-converter/metadata.xml
+++ b/net-misc/gns3-converter/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>bman@gentoo.org</email>
<name>Aaron Bauman</name>
</maintainer>
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index 5d17ca27e775..913fed4c205e 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/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>bman@gentoo.org</email>
<name>Aaron Bauman</name>
</maintainer>
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 6553eda3e508..6234ae3cbf04 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-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="person">
<email>bman@gentoo.org</email>
<name>Aaron Bauman</name>
</maintainer>
diff --git a/net-misc/gofish/metadata.xml b/net-misc/gofish/metadata.xml
index bcf19edfcbef..bd537594c884 100644
--- a/net-misc/gofish/metadata.xml
+++ b/net-misc/gofish/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-misc/gogoc/metadata.xml b/net-misc/gogoc/metadata.xml
index 97e409c9d05a..18e3b6b2dedc 100644
--- a/net-misc/gogoc/metadata.xml
+++ b/net-misc/gogoc/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-misc/googlecl/metadata.xml b/net-misc/googlecl/metadata.xml
index d08f52481e05..c2c329857b77 100644
--- a/net-misc/googlecl/metadata.xml
+++ b/net-misc/googlecl/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>wired@gentoo.org</email>
<name>Alex Alexander</name>
</maintainer>
diff --git a/net-misc/grdesktop/metadata.xml b/net-misc/grdesktop/metadata.xml
index 7a288dfa1ab2..97c0fce8f6f8 100644
--- a/net-misc/grdesktop/metadata.xml
+++ b/net-misc/grdesktop/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-misc/grive/metadata.xml b/net-misc/grive/metadata.xml
index c534f67229c3..edd361ec1a3b 100644
--- a/net-misc/grive/metadata.xml
+++ b/net-misc/grive/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>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index 3016618650da..2b6cd86af0a4 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/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-misc/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
index cae2a6d112df..df60255c433f 100644
--- a/net-misc/gsutil/metadata.xml
+++ b/net-misc/gsutil/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>vapier@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-misc/gtkvncviewer/metadata.xml b/net-misc/gtkvncviewer/metadata.xml
index eeff86f130f0..03a08235b0a5 100644
--- a/net-misc/gtkvncviewer/metadata.xml
+++ b/net-misc/gtkvncviewer/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>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
diff --git a/net-misc/guacamole-server/metadata.xml b/net-misc/guacamole-server/metadata.xml
index 6a85e12515bf..9187433e5ba5 100644
--- a/net-misc/guacamole-server/metadata.xml
+++ b/net-misc/guacamole-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="person">
<email>nativemad@gentoo.org</email>
<name>Andreas Schuerch</name>
</maintainer>
diff --git a/net-misc/gupnp-tools/metadata.xml b/net-misc/gupnp-tools/metadata.xml
index fe3dc94b2bcd..39980802b1da 100644
--- a/net-misc/gupnp-tools/metadata.xml
+++ b/net-misc/gupnp-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>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-misc/gvrpcd/metadata.xml b/net-misc/gvrpcd/metadata.xml
index 9d954f4229bb..02c562591bc7 100644
--- a/net-misc/gvrpcd/metadata.xml
+++ b/net-misc/gvrpcd/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>azamat.hackimov@gmail.com</email>
<name>Azamat H. Hackimov</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</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-misc/gwget/metadata.xml b/net-misc/gwget/metadata.xml
index 4d37232aa036..25e77310cc10 100644
--- a/net-misc/gwget/metadata.xml
+++ b/net-misc/gwget/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-misc/gwhois/metadata.xml b/net-misc/gwhois/metadata.xml
index 12152959d0ab..00c016332670 100644
--- a/net-misc/gwhois/metadata.xml
+++ b/net-misc/gwhois/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>wschlich@gentoo.org</email>
<name>Wolfram Schlich</name>
<description>Primary maintainer</description>
diff --git a/net-misc/haeredes/metadata.xml b/net-misc/haeredes/metadata.xml
index df7fdbeaf2b3..45125b9b6e99 100644
--- a/net-misc/haeredes/metadata.xml
+++ b/net-misc/haeredes/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-misc/hath/metadata.xml b/net-misc/hath/metadata.xml
index df7fdbeaf2b3..45125b9b6e99 100644
--- a/net-misc/hath/metadata.xml
+++ b/net-misc/hath/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-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
index e4fbb03b8cd1..9fcc5c61b405 100644
--- a/net-misc/hotot/metadata.xml
+++ b/net-misc/hotot/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-misc/hsc/metadata.xml b/net-misc/hsc/metadata.xml
index 3409127f534c..ffac4d7ebc01 100644
--- a/net-misc/hsc/metadata.xml
+++ b/net-misc/hsc/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>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
diff --git a/net-misc/htpdate/metadata.xml b/net-misc/htpdate/metadata.xml
index 8ad2b4de9bf4..6759215a936f 100644
--- a/net-misc/htpdate/metadata.xml
+++ b/net-misc/htpdate/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>nullishzero@gentoo.org</email>
<name>Pavel Kazakov</name>
</maintainer>
diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
index fe7a82bbf2f4..34aed7f5eb16 100644
--- a/net-misc/httpie/metadata.xml
+++ b/net-misc/httpie/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>vikraman@gentoo.org</email>
<name>Vikraman Choudhury</name>
</maintainer>
diff --git a/net-misc/httptype/metadata.xml b/net-misc/httptype/metadata.xml
index 85f78bd85837..f2da4c7b57cd 100644
--- a/net-misc/httptype/metadata.xml
+++ b/net-misc/httptype/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-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml
index f44fa08f6fba..65cb7289ceed 100644
--- a/net-misc/hylafaxplus/metadata.xml
+++ b/net-misc/hylafaxplus/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-misc/i2pd/metadata.xml b/net-misc/i2pd/metadata.xml
index 4f8a4cad1613..36a11c9a1446 100644
--- a/net-misc/i2pd/metadata.xml
+++ b/net-misc/i2pd/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>klondike@gentoo.org</email>
<name>Francisco Blas Izquierdo Riera</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
diff --git a/net-misc/icaclient/metadata.xml b/net-misc/icaclient/metadata.xml
index aaf9b449ac5a..d14a9e07b21d 100644
--- a/net-misc/icaclient/metadata.xml
+++ b/net-misc/icaclient/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>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
diff --git a/net-misc/icecast/metadata.xml b/net-misc/icecast/metadata.xml
index 0d2c237afa84..706360d136cc 100644
--- a/net-misc/icecast/metadata.xml
+++ b/net-misc/icecast/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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
diff --git a/net-misc/ices/metadata.xml b/net-misc/ices/metadata.xml
index 798a87bd625c..39626a990be5 100644
--- a/net-misc/ices/metadata.xml
+++ b/net-misc/ices/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>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
diff --git a/net-misc/ifenslave/metadata.xml b/net-misc/ifenslave/metadata.xml
index 75c5a9141f49..c57573a31def 100644
--- a/net-misc/ifenslave/metadata.xml
+++ b/net-misc/ifenslave/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="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/iodine/metadata.xml b/net-misc/iodine/metadata.xml
index c1caab4cfd75..e8b8983b2dad 100644
--- a/net-misc/iodine/metadata.xml
+++ b/net-misc/iodine/metadata.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>vostorga@gentoo.org</email>
<name>Víctor Ostorga</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>root@kryo.se</email>
<name>Erik Ekman</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/ip-sentinel/metadata.xml b/net-misc/ip-sentinel/metadata.xml
index 0af22b0ab1c9..c89beb74d359 100644
--- a/net-misc/ip-sentinel/metadata.xml
+++ b/net-misc/ip-sentinel/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-misc/ipcalc/metadata.xml b/net-misc/ipcalc/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-misc/ipcalc/metadata.xml
+++ b/net-misc/ipcalc/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-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 5b58eafd18b1..c2391d465b93 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/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-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml
index 7f679d64a788..041c1966b76b 100644
--- a/net-misc/iprange/metadata.xml
+++ b/net-misc/iprange/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>alonbl@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/ipsc/metadata.xml b/net-misc/ipsc/metadata.xml
index 184e67984452..c2ecba5c11f7 100644
--- a/net-misc/ipsc/metadata.xml
+++ b/net-misc/ipsc/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>
<description>This LINX engineer favourite is actively maintained.</description>
diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index 9b7fe83b2295..8fb0527115b6 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml
index 13913ef923b4..3876a7a7b381 100644
--- a/net-misc/ipv6calc/metadata.xml
+++ b/net-misc/ipv6calc/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>pva@gentoo.org</email>
<name>Peter Volkov</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/isatapd/metadata.xml b/net-misc/isatapd/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-misc/isatapd/metadata.xml
+++ b/net-misc/isatapd/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-misc/ixp4xx/metadata.xml b/net-misc/ixp4xx/metadata.xml
index 54f933baad7c..7bf519a40201 100644
--- a/net-misc/ixp4xx/metadata.xml
+++ b/net-misc/ixp4xx/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>arm@gentoo.org</email>
<name>Gentoo Linux ARM Development</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>embedded@gentoo.org</email>
<name>Embedded Gentoo</name>
</maintainer>
diff --git a/net-misc/java-wakeonlan/metadata.xml b/net-misc/java-wakeonlan/metadata.xml
index 6cb58e33adfe..2444066aa02b 100644
--- a/net-misc/java-wakeonlan/metadata.xml
+++ b/net-misc/java-wakeonlan/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>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/net-misc/jrdesktop/metadata.xml b/net-misc/jrdesktop/metadata.xml
index 506f7157d6c3..dccb14c6e984 100644
--- a/net-misc/jrdesktop/metadata.xml
+++ b/net-misc/jrdesktop/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>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/net-misc/jwhois/metadata.xml b/net-misc/jwhois/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/net-misc/jwhois/metadata.xml
+++ b/net-misc/jwhois/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/kea/metadata.xml b/net-misc/kea/metadata.xml
index 38dce10c1d83..33e420089b5e 100644
--- a/net-misc/kea/metadata.xml
+++ b/net-misc/kea/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>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index d21514d0e8fd..1ef67924b8b4 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/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>drobbins@funtoo.org</email>
<name>Daniel Robbins</name>
<description>Upstream contact, please CC on bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/knemo/metadata.xml b/net-misc/knemo/metadata.xml
index e218a13609c3..2fdbf33d963d 100644
--- a/net-misc/knemo/metadata.xml
+++ b/net-misc/knemo/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>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
index ce6fe1636d3c..8d375f5d42e9 100644
--- a/net-misc/knock/metadata.xml
+++ b/net-misc/knock/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-misc/knutclient/metadata.xml b/net-misc/knutclient/metadata.xml
index f38d43267b1e..0cf59224b009 100644
--- a/net-misc/knutclient/metadata.xml
+++ b/net-misc/knutclient/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>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/net-misc/ksshaskpass/metadata.xml b/net-misc/ksshaskpass/metadata.xml
index f38d43267b1e..0cf59224b009 100644
--- a/net-misc/ksshaskpass/metadata.xml
+++ b/net-misc/ksshaskpass/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>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/net-misc/kvpnc/metadata.xml b/net-misc/kvpnc/metadata.xml
index 710850e4961f..bddd8b4a2053 100644
--- a/net-misc/kvpnc/metadata.xml
+++ b/net-misc/kvpnc/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>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/net-misc/l7-filter-userspace/metadata.xml b/net-misc/l7-filter-userspace/metadata.xml
index 48d2efa9157d..d204a62cf580 100644
--- a/net-misc/l7-filter-userspace/metadata.xml
+++ b/net-misc/l7-filter-userspace/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>bircoph@gentoo.org</email>
<name>Andrew Savchenko</name>
</maintainer>
diff --git a/net-misc/l7-protocols/metadata.xml b/net-misc/l7-protocols/metadata.xml
index 125e82bf5480..30de8b041c0b 100644
--- a/net-misc/l7-protocols/metadata.xml
+++ b/net-misc/l7-protocols/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>bircoph@gentoo.org</email>
<name>Andrew Savchenko</name>
</maintainer>
diff --git a/net-misc/lanmap/metadata.xml b/net-misc/lanmap/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-misc/lanmap/metadata.xml
+++ b/net-misc/lanmap/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-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
index 63cad2ea36e6..b1d1e33aef3d 100644
--- a/net-misc/lcr/metadata.xml
+++ b/net-misc/lcr/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-misc/leapcast/metadata.xml b/net-misc/leapcast/metadata.xml
index b0e0a5887535..770b49cab611 100644
--- a/net-misc/leapcast/metadata.xml
+++ b/net-misc/leapcast/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>bman@gentoo.org</email>
<name>Aaron Bauman</name>
</maintainer>
diff --git a/net-misc/libres3/metadata.xml b/net-misc/libres3/metadata.xml
index cdb074ca6c74..e6ef377f51c1 100644
--- a/net-misc/libres3/metadata.xml
+++ b/net-misc/libres3/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>tomboy64@sina.cn</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/libreswan/metadata.xml b/net-misc/libreswan/metadata.xml
index 006bc2396c11..258e65f32b14 100644
--- a/net-misc/libreswan/metadata.xml
+++ b/net-misc/libreswan/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
diff --git a/net-misc/libss7/metadata.xml b/net-misc/libss7/metadata.xml
index 3ed4669f55a4..5087760546f6 100644
--- a/net-misc/libss7/metadata.xml
+++ b/net-misc/libss7/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-misc/linux-eoip/metadata.xml b/net-misc/linux-eoip/metadata.xml
index 597c68880bb2..c34475324962 100644
--- a/net-misc/linux-eoip/metadata.xml
+++ b/net-misc/linux-eoip/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>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</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-misc/linuxptp/metadata.xml b/net-misc/linuxptp/metadata.xml
index fb12766c5057..0a0544e123f3 100644
--- a/net-misc/linuxptp/metadata.xml
+++ b/net-misc/linuxptp/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>tomjbe@gentoo.org</email>
<name>Thomas Beierlein</name>
</maintainer>
diff --git a/net-misc/livestreamer/metadata.xml b/net-misc/livestreamer/metadata.xml
index 6e2d5a31369e..144557cb395e 100644
--- a/net-misc/livestreamer/metadata.xml
+++ b/net-misc/livestreamer/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>the.telvanni@gmail.com</email>
<name>Guillaume Lespinasse</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/lksctp-tools/metadata.xml b/net-misc/lksctp-tools/metadata.xml
index 7e21d5b7500d..882d23fe110a 100644
--- a/net-misc/lksctp-tools/metadata.xml
+++ b/net-misc/lksctp-tools/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>flameeyes@gentoo.org</email>
<description>
Diego and Luca are using SCTP for development, so they'll know
if it works
</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>lu_zero@gentoo.org</email>
<description>
Luca and Diego are using SCTP for development, so they'll know
if it works
</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index cf1e276625f8..538130bba261 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/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-misc/logmein-hamachi/metadata.xml b/net-misc/logmein-hamachi/metadata.xml
index 08fd0be8e070..14dde2333ec1 100644
--- a/net-misc/logmein-hamachi/metadata.xml
+++ b/net-misc/logmein-hamachi/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>nonno.cicala@libero.it</email>
<name>Simone Scanzoni</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/mediatomb/metadata.xml b/net-misc/mediatomb/metadata.xml
index 336d2e78776e..f49135825709 100644
--- a/net-misc/mediatomb/metadata.xml
+++ b/net-misc/mediatomb/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>thev00d00@gentoo.org</email>
<name>Ian Whyman</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>media-video@gentoo.org</email>
<name>Gentoo Video project</name>
</maintainer>
diff --git a/net-misc/megatools/metadata.xml b/net-misc/megatools/metadata.xml
index 579df4723ce3..bab792ed6d53 100644
--- a/net-misc/megatools/metadata.xml
+++ b/net-misc/megatools/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/net-misc/memcached/metadata.xml b/net-misc/memcached/metadata.xml
index 67d99f9fa5cf..6dd9383f7c33 100644
--- a/net-misc/memcached/metadata.xml
+++ b/net-misc/memcached/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="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
<longdescription>High-performance, distributed memory object caching system, generic in nature,
diff --git a/net-misc/mico/metadata.xml b/net-misc/mico/metadata.xml
index ce47791ca7ae..89b3f821e9ce 100644
--- a/net-misc/mico/metadata.xml
+++ b/net-misc/mico/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>haubi@gentoo.org</email>
<name>Michael Haubenwallner</name>
</maintainer>
diff --git a/net-misc/mikutter/metadata.xml b/net-misc/mikutter/metadata.xml
index ac07e856ce8a..74eccf1850fc 100644
--- a/net-misc/mikutter/metadata.xml
+++ b/net-misc/mikutter/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>naota@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/mindterm/metadata.xml b/net-misc/mindterm/metadata.xml
index 6cb58e33adfe..2444066aa02b 100644
--- a/net-misc/mindterm/metadata.xml
+++ b/net-misc/mindterm/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>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml
index 469acd8e764c..892e59c35397 100644
--- a/net-misc/minidlna/metadata.xml
+++ b/net-misc/minidlna/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-misc/minissdpd/metadata.xml b/net-misc/minissdpd/metadata.xml
index 1e7587374fdf..d920e3ba3e56 100644
--- a/net-misc/minissdpd/metadata.xml
+++ b/net-misc/minissdpd/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-misc/miniupnpd/metadata.xml b/net-misc/miniupnpd/metadata.xml
index 3daf0e8091b2..eaaaddf0d4d3 100644
--- a/net-misc/miniupnpd/metadata.xml
+++ b/net-misc/miniupnpd/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>gurligebis@gentoo.org</email>
<name>Bjarke Istrup Pedersen</name>
</maintainer>
diff --git a/net-misc/miredo/metadata.xml b/net-misc/miredo/metadata.xml
index abf93b943396..c13bff68bced 100644
--- a/net-misc/miredo/metadata.xml
+++ b/net-misc/miredo/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="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/net-misc/mobile-broadband-provider-info/metadata.xml b/net-misc/mobile-broadband-provider-info/metadata.xml
index fe3dc94b2bcd..39980802b1da 100644
--- a/net-misc/mobile-broadband-provider-info/metadata.xml
+++ b/net-misc/mobile-broadband-provider-info/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-misc/modemmanager/metadata.xml b/net-misc/modemmanager/metadata.xml
index df4898fdec4f..2e8801cb40a8 100644
--- a/net-misc/modemmanager/metadata.xml
+++ b/net-misc/modemmanager/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-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 5f54860e923b..ee89d1f828e8 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/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>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
</maintainer>
diff --git a/net-misc/mulk/metadata.xml b/net-misc/mulk/metadata.xml
index e6a7a27838a9..616f1fe1a5a0 100644
--- a/net-misc/mulk/metadata.xml
+++ b/net-misc/mulk/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-misc/nat-traverse/metadata.xml b/net-misc/nat-traverse/metadata.xml
index c07b37ef258b..1ed5bc11cf89 100644
--- a/net-misc/nat-traverse/metadata.xml
+++ b/net-misc/nat-traverse/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-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index acde6b58a998..c04ba062f30f 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/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-misc/ndisc6/metadata.xml b/net-misc/ndisc6/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-misc/ndisc6/metadata.xml
+++ b/net-misc/ndisc6/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-misc/ndppd/metadata.xml b/net-misc/ndppd/metadata.xml
index 70b099927c12..f4ddc7906918 100644
--- a/net-misc/ndppd/metadata.xml
+++ b/net-misc/ndppd/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-misc/nemesis/metadata.xml b/net-misc/nemesis/metadata.xml
index 55e7202afeb0..d0f86294cbe0 100644
--- a/net-misc/nemesis/metadata.xml
+++ b/net-misc/nemesis/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>rainbow@irh.it</email>
<name>rainbow</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/netctl/metadata.xml b/net-misc/netctl/metadata.xml
index c524795cfacb..a604eb0048a1 100644
--- a/net-misc/netctl/metadata.xml
+++ b/net-misc/netctl/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
diff --git a/net-misc/netdate/metadata.xml b/net-misc/netdate/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/netdate/metadata.xml
+++ b/net-misc/netdate/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-misc/netfleet/metadata.xml b/net-misc/netfleet/metadata.xml
index 814c9e0b8edd..0602d77bce69 100644
--- a/net-misc/netfleet/metadata.xml
+++ b/net-misc/netfleet/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-misc/netifrc/metadata.xml b/net-misc/netifrc/metadata.xml
index 24a084b29e4f..174f393836d4 100644
--- a/net-misc/netifrc/metadata.xml
+++ b/net-misc/netifrc/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>netifrc@gentoo.org</email>
</maintainer>
<longdescription lang="en">
diff --git a/net-misc/netkit-bootparamd/metadata.xml b/net-misc/netkit-bootparamd/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-misc/netkit-bootparamd/metadata.xml
+++ b/net-misc/netkit-bootparamd/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-misc/netkit-bootpd/metadata.xml b/net-misc/netkit-bootpd/metadata.xml
index 5b80fb94c393..a535b8852829 100644
--- a/net-misc/netkit-bootpd/metadata.xml
+++ b/net-misc/netkit-bootpd/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-misc/netkit-fingerd/metadata.xml b/net-misc/netkit-fingerd/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/net-misc/netkit-fingerd/metadata.xml
+++ b/net-misc/netkit-fingerd/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/netkit-rsh/metadata.xml b/net-misc/netkit-rsh/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/net-misc/netkit-rsh/metadata.xml
+++ b/net-misc/netkit-rsh/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/netkit-rwho/metadata.xml b/net-misc/netkit-rwho/metadata.xml
index fcdeee5abccf..789a44405524 100644
--- a/net-misc/netkit-rwho/metadata.xml
+++ b/net-misc/netkit-rwho/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-misc/netpipes/metadata.xml b/net-misc/netpipes/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-misc/netpipes/metadata.xml
+++ b/net-misc/netpipes/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-misc/netstat-nat/metadata.xml b/net-misc/netstat-nat/metadata.xml
index 9fa8050550d6..74c2baebb4ec 100644
--- a/net-misc/netstat-nat/metadata.xml
+++ b/net-misc/netstat-nat/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-misc/networkmanager-openconnect/metadata.xml b/net-misc/networkmanager-openconnect/metadata.xml
index 0c22cbb8c00b..30c8deabf55b 100644
--- a/net-misc/networkmanager-openconnect/metadata.xml
+++ b/net-misc/networkmanager-openconnect/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>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-misc/networkmanager-openswan/metadata.xml b/net-misc/networkmanager-openswan/metadata.xml
index 0c22cbb8c00b..30c8deabf55b 100644
--- a/net-misc/networkmanager-openswan/metadata.xml
+++ b/net-misc/networkmanager-openswan/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>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-misc/networkmanager-openvpn/metadata.xml b/net-misc/networkmanager-openvpn/metadata.xml
index 0c22cbb8c00b..30c8deabf55b 100644
--- a/net-misc/networkmanager-openvpn/metadata.xml
+++ b/net-misc/networkmanager-openvpn/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>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-misc/networkmanager-pptp/metadata.xml b/net-misc/networkmanager-pptp/metadata.xml
index 0c22cbb8c00b..30c8deabf55b 100644
--- a/net-misc/networkmanager-pptp/metadata.xml
+++ b/net-misc/networkmanager-pptp/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>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-misc/networkmanager-sstp/metadata.xml b/net-misc/networkmanager-sstp/metadata.xml
index ffae8fa43aa2..e8ba317f6426 100644
--- a/net-misc/networkmanager-sstp/metadata.xml
+++ b/net-misc/networkmanager-sstp/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>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</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-misc/networkmanager-vpnc/metadata.xml b/net-misc/networkmanager-vpnc/metadata.xml
index 0c22cbb8c00b..30c8deabf55b 100644
--- a/net-misc/networkmanager-vpnc/metadata.xml
+++ b/net-misc/networkmanager-vpnc/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>steev@gentoo.org</email>
<name>Stephen Klimaszewski</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnome@gentoo.org</email>
<name>Gentoo GNOME Desktop</name>
</maintainer>
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 25cc0483a0c4..420c24a93efa 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/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-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
index 40d676929ec1..1df7a04f2cb5 100644
--- a/net-misc/npapi-sdk/metadata.xml
+++ b/net-misc/npapi-sdk/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>anarchy@gentoo.org</email>
<name>Jory A. Pratt</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>mozilla@gentoo.org</email>
<name>Gentoo Mozilla Team</name>
</maintainer>
diff --git a/net-misc/nstx/metadata.xml b/net-misc/nstx/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/nstx/metadata.xml
+++ b/net-misc/nstx/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-misc/ntp/metadata.xml b/net-misc/ntp/metadata.xml
index cfa6d709ecf4..88e81f1ab224 100644
--- a/net-misc/ntp/metadata.xml
+++ b/net-misc/ntp/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/ntpclient/metadata.xml b/net-misc/ntpclient/metadata.xml
index 9b789bab0b42..3f576f05f291 100644
--- a/net-misc/ntpclient/metadata.xml
+++ b/net-misc/ntpclient/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>monsieurp@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/nx/metadata.xml b/net-misc/nx/metadata.xml
index 437701bff2cd..1b5df39c0204 100644
--- a/net-misc/nx/metadata.xml
+++ b/net-misc/nx/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-misc/nxplayer/metadata.xml b/net-misc/nxplayer/metadata.xml
index 97ab237c6099..657a3a3df937 100644
--- a/net-misc/nxplayer/metadata.xml
+++ b/net-misc/nxplayer/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-misc/ocsync/metadata.xml b/net-misc/ocsync/metadata.xml
index f713f2a74b47..4ce4054df697 100644
--- a/net-misc/ocsync/metadata.xml
+++ b/net-misc/ocsync/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-misc/ofono/metadata.xml b/net-misc/ofono/metadata.xml
index 920e54db966e..084e8d5b0864 100644
--- a/net-misc/ofono/metadata.xml
+++ b/net-misc/ofono/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/net-misc/oidentd/metadata.xml b/net-misc/oidentd/metadata.xml
index aefe4c94ef4c..e4c418f29f15 100644
--- a/net-misc/oidentd/metadata.xml
+++ b/net-misc/oidentd/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>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
diff --git a/net-misc/olsrd/metadata.xml b/net-misc/olsrd/metadata.xml
index 0ffe1bfd7618..5a1307da4ef3 100644
--- a/net-misc/olsrd/metadata.xml
+++ b/net-misc/olsrd/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>jer@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index 47c52c1154d4..3f6c9be8aad3 100644
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/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>caster@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-misc/openconnect/metadata.xml b/net-misc/openconnect/metadata.xml
index 46c8876c38f9..23bfc659d2d5 100644
--- a/net-misc/openconnect/metadata.xml
+++ b/net-misc/openconnect/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>williamh@gentoo.org</email>
<name>William Hubbs</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mattsch@gmail.com</email>
<name>Matthew Schultz</name>
<description>Proxied maintainer. Copy on bugs.</description>
diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml
index a2ffa4bfa99b..72d403337171 100644
--- a/net-misc/openntpd/metadata.xml
+++ b/net-misc/openntpd/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>henson@acm.org</email>
<name>Paul B. Henson</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>ottxor@gentoo.org</email>
<name>Christoph Junghans (proxy)</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/openr2/metadata.xml b/net-misc/openr2/metadata.xml
index 19e0cdcbf26f..6d1856e9c241 100644
--- a/net-misc/openr2/metadata.xml
+++ b/net-misc/openr2/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-misc/openrdate/metadata.xml b/net-misc/openrdate/metadata.xml
index 3aaf73907939..bbbc68551751 100644
--- a/net-misc/openrdate/metadata.xml
+++ b/net-misc/openrdate/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-misc/openssh-blacklist/metadata.xml b/net-misc/openssh-blacklist/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/net-misc/openssh-blacklist/metadata.xml
+++ b/net-misc/openssh-blacklist/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index 0997b8b0c5ec..1d275bddd6df 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/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 restrict="net-misc/openssh[ldap]">
+ <maintainer restrict="net-misc/openssh[ldap]" type="person">
<email>robbat2@gentoo.org</email>
<description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/openvpn-auth-ldap/metadata.xml b/net-misc/openvpn-auth-ldap/metadata.xml
index a95d24666619..e1e2d9a19494 100644
--- a/net-misc/openvpn-auth-ldap/metadata.xml
+++ b/net-misc/openvpn-auth-ldap/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-misc/openvpn/metadata.xml b/net-misc/openvpn/metadata.xml
index 7f3d1f95164c..8969781cea2e 100644
--- a/net-misc/openvpn/metadata.xml
+++ b/net-misc/openvpn/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>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index 10706eb21d04..f20e0a0507bd 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/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>dev-zero@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
</maintainer>
diff --git a/net-misc/owncloud-client/metadata.xml b/net-misc/owncloud-client/metadata.xml
index e1a30b933e73..25d0eab738b2 100644
--- a/net-misc/owncloud-client/metadata.xml
+++ b/net-misc/owncloud-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="person">
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
diff --git a/net-misc/packETH/metadata.xml b/net-misc/packETH/metadata.xml
index 76fd4b106d4d..25820382f571 100644
--- a/net-misc/packETH/metadata.xml
+++ b/net-misc/packETH/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-misc/pavuk/metadata.xml b/net-misc/pavuk/metadata.xml
index e3f4cbf2e449..e5ffb637f84c 100644
--- a/net-misc/pavuk/metadata.xml
+++ b/net-misc/pavuk/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>pyxlcy@gmail.com</email>
<description>Please assign bugs</description>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>pacho@gentoo.org</email>
<description>proxy-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-misc/pcapfix/metadata.xml b/net-misc/pcapfix/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/pcapfix/metadata.xml
+++ b/net-misc/pcapfix/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-misc/pedro/metadata.xml b/net-misc/pedro/metadata.xml
index f21843862263..84cf23a5f3c1 100644
--- a/net-misc/pedro/metadata.xml
+++ b/net-misc/pedro/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>keri@gentoo.org</email>
<name>Keri Harris</name>
</maintainer>
diff --git a/net-misc/pipes/metadata.xml b/net-misc/pipes/metadata.xml
index 3db99ca629ce..abddd073acfe 100644
--- a/net-misc/pipes/metadata.xml
+++ b/net-misc/pipes/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-misc/plowshare/metadata.xml b/net-misc/plowshare/metadata.xml
index c4459b9c583c..97b641614acf 100644
--- a/net-misc/plowshare/metadata.xml
+++ b/net-misc/plowshare/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-misc/pmsvn/metadata.xml b/net-misc/pmsvn/metadata.xml
index b85ed6c47c45..7861b3ffc82e 100644
--- a/net-misc/pmsvn/metadata.xml
+++ b/net-misc/pmsvn/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-misc/polly/metadata.xml b/net-misc/polly/metadata.xml
index a8fc0f18e750..874483cc9378 100644
--- a/net-misc/polly/metadata.xml
+++ b/net-misc/polly/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>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/net-misc/portspoof/metadata.xml b/net-misc/portspoof/metadata.xml
index adaca1811357..ba12919c128c 100644
--- a/net-misc/portspoof/metadata.xml
+++ b/net-misc/portspoof/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-misc/pps-tools/metadata.xml b/net-misc/pps-tools/metadata.xml
index dbd59a69c49f..53886946600b 100644
--- a/net-misc/pps-tools/metadata.xml
+++ b/net-misc/pps-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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/proxychains/metadata.xml b/net-misc/proxychains/metadata.xml
index a22e34547027..08334168ca3c 100644
--- a/net-misc/proxychains/metadata.xml
+++ b/net-misc/proxychains/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>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/net-misc/proxytunnel/metadata.xml b/net-misc/proxytunnel/metadata.xml
index 1cd6962e5179..faa64f120cb8 100644
--- a/net-misc/proxytunnel/metadata.xml
+++ b/net-misc/proxytunnel/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>vikraman@gentoo.org</email>
<name>Vikraman Choudhury</name>
</maintainer>
diff --git a/net-misc/ps3mediaserver/metadata.xml b/net-misc/ps3mediaserver/metadata.xml
index 3e5aa55ddaa5..251933666ff1 100644
--- a/net-misc/ps3mediaserver/metadata.xml
+++ b/net-misc/ps3mediaserver/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>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>vapier@gentoo.org</email>
</maintainer>
<use>
diff --git a/net-misc/pssh/metadata.xml b/net-misc/pssh/metadata.xml
index 21205b281768..b6d9446e89b5 100644
--- a/net-misc/pssh/metadata.xml
+++ b/net-misc/pssh/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>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
</maintainer>
diff --git a/net-misc/ptpd/metadata.xml b/net-misc/ptpd/metadata.xml
index 511627363af4..3d16c3a14245 100644
--- a/net-misc/ptpd/metadata.xml
+++ b/net-misc/ptpd/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>honza.breuer@gmail.com</email>
<name>Jan Breuer</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index c70024523211..a1387191162a 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/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>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
diff --git a/net-misc/pycnb/metadata.xml b/net-misc/pycnb/metadata.xml
index 1644d8bc7575..0f20bbcf2c90 100644
--- a/net-misc/pycnb/metadata.xml
+++ b/net-misc/pycnb/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>yac@gentoo.org</email>
<name>Jan Matejka</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/net-misc/pyhoca-cli/metadata.xml b/net-misc/pyhoca-cli/metadata.xml
index 5db29427ae60..fa439d9e97ee 100644
--- a/net-misc/pyhoca-cli/metadata.xml
+++ b/net-misc/pyhoca-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>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
diff --git a/net-misc/pyhoca-gui/metadata.xml b/net-misc/pyhoca-gui/metadata.xml
index 99ff893038d8..b87a98e44d52 100644
--- a/net-misc/pyhoca-gui/metadata.xml
+++ b/net-misc/pyhoca-gui/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-misc/pymazon/metadata.xml b/net-misc/pymazon/metadata.xml
index 8299a763f40b..28aba46eec69 100644
--- a/net-misc/pymazon/metadata.xml
+++ b/net-misc/pymazon/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>desktop-misc@gentoo.org</email>
<name>Gentoo Desktop Miscellaneous Project</name>
</maintainer>
diff --git a/net-misc/python-x2go/metadata.xml b/net-misc/python-x2go/metadata.xml
index e102151ca032..0a75ba291b54 100644
--- a/net-misc/python-x2go/metadata.xml
+++ b/net-misc/python-x2go/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-misc/qtm/metadata.xml b/net-misc/qtm/metadata.xml
index a13dd5b71d10..f628dd4f826f 100644
--- a/net-misc/qtm/metadata.xml
+++ b/net-misc/qtm/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>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
diff --git a/net-misc/quagga/metadata.xml b/net-misc/quagga/metadata.xml
index 8a4fab8dcb40..83607261adf1 100644
--- a/net-misc/quagga/metadata.xml
+++ b/net-misc/quagga/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/quickshare/metadata.xml b/net-misc/quickshare/metadata.xml
index 1baa46d82420..0b87a0d3d871 100644
--- a/net-misc/quickshare/metadata.xml
+++ b/net-misc/quickshare/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>jdhore@gentoo.org</email>
<name>Jeff Horelick</name>
</maintainer>
diff --git a/net-misc/r8168/metadata.xml b/net-misc/r8168/metadata.xml
index 04c256fd0ebc..31b4221e42ea 100644
--- a/net-misc/r8168/metadata.xml
+++ b/net-misc/r8168/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>chewi@gentoo.org</email>
<name>James Le Cuirot</name>
</maintainer>
diff --git a/net-misc/rabbitmq-server/metadata.xml b/net-misc/rabbitmq-server/metadata.xml
index 17ee492d81e1..69bc0ccc3d1f 100644
--- a/net-misc/rabbitmq-server/metadata.xml
+++ b/net-misc/rabbitmq-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="person">
<email>ultrabug@gentoo.org</email>
<name>Ultrabug</name>
</maintainer>
diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml
index 74f40b3dcdab..8307f5e2d4f5 100644
--- a/net-misc/radvd/metadata.xml
+++ b/net-misc/radvd/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>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/net-misc/rancid-git/metadata.xml b/net-misc/rancid-git/metadata.xml
index 8d880fd9bc07..a15fa8cca8ed 100644
--- a/net-misc/rancid-git/metadata.xml
+++ b/net-misc/rancid-git/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>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
index 27bc871d0b74..9698a7026031 100644
--- a/net-misc/rancid/metadata.xml
+++ b/net-misc/rancid/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>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/rdate/metadata.xml b/net-misc/rdate/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/rdate/metadata.xml
+++ b/net-misc/rdate/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-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index c18fe09e213d..f1f3b0c0a220 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/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-misc/redir/metadata.xml b/net-misc/redir/metadata.xml
index f040f077789b..6b92650506ba 100644
--- a/net-misc/redir/metadata.xml
+++ b/net-misc/redir/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>brendan@horan.hk</email>
<name>Brendan Hhoran</name>
<description>Proxy maintainer, to be assigned all bugs</description>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index ab0b675ebc2a..ffc6f6f40d1b 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/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>tristan@gentoo.org</email>
<name>Tristan Heaven</name>
</maintainer>
diff --git a/net-misc/ris-linux/metadata.xml b/net-misc/ris-linux/metadata.xml
index 9e11bad60c03..8f93e4dab3d6 100644
--- a/net-misc/ris-linux/metadata.xml
+++ b/net-misc/ris-linux/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>maksbotan@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index d98da4ca574f..148a18e18adc 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/rygel/metadata.xml b/net-misc/rygel/metadata.xml
index 0ea1a5e7e8c0..359230bd52f1 100644
--- a/net-misc/rygel/metadata.xml
+++ b/net-misc/rygel/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-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index 0b579e115a6d..0f463c3b5161 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/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>igor@itesten.com</email>
<name>Igor Testen</name>
<description>Proxy maintainer, assign bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>titanofold@gentoo.org</email>
<name>Aaron W. Swenson</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
index 94e4603ee75c..69bb171e770f 100644
--- a/net-misc/samplicator/metadata.xml
+++ b/net-misc/samplicator/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>Primary maintainer.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/secpanel/metadata.xml b/net-misc/secpanel/metadata.xml
index 5506ac77eb9a..15e1a0cb3d07 100644
--- a/net-misc/secpanel/metadata.xml
+++ b/net-misc/secpanel/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-misc/ser2net/metadata.xml b/net-misc/ser2net/metadata.xml
index 669cdaf86416..730186acfd0b 100644
--- a/net-misc/ser2net/metadata.xml
+++ b/net-misc/ser2net/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>brendan@horan.hk</email>
<name>Brendan Horan</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/sgopherd/metadata.xml b/net-misc/sgopherd/metadata.xml
index 3b9f77da53a3..aa3406196cb1 100644
--- a/net-misc/sgopherd/metadata.xml
+++ b/net-misc/sgopherd/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/shmux/metadata.xml b/net-misc/shmux/metadata.xml
index c514a998b805..bb9f6a6873ed 100644
--- a/net-misc/shmux/metadata.xml
+++ b/net-misc/shmux/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>alicef@gentoo.org</email>
<name>Alice Ferrazzi</name>
</maintainer>
diff --git a/net-misc/shout/metadata.xml b/net-misc/shout/metadata.xml
index 196439396531..c870d0eef0ab 100644
--- a/net-misc/shout/metadata.xml
+++ b/net-misc/shout/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>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
diff --git a/net-misc/sipsak/metadata.xml b/net-misc/sipsak/metadata.xml
index 7e6b8b37f4a9..9a14eb279ec0 100644
--- a/net-misc/sipsak/metadata.xml
+++ b/net-misc/sipsak/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>
</maintainer>
<upstream>
diff --git a/net-misc/sitecopy/metadata.xml b/net-misc/sitecopy/metadata.xml
index e7f31aa4c75b..b03b823d1292 100644
--- a/net-misc/sitecopy/metadata.xml
+++ b/net-misc/sitecopy/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>rogerx.oss@gmail.com</email>
<name>Roger Zauner</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-misc/sks/metadata.xml b/net-misc/sks/metadata.xml
index 5b619cd7fdab..a4ac7ae76892 100644
--- a/net-misc/sks/metadata.xml
+++ b/net-misc/sks/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>k_f@gentoo.org</email>
<name>Kristian Fiskerstrand</name>
<description>Maintainer</description>
diff --git a/net-misc/slimrat/metadata.xml b/net-misc/slimrat/metadata.xml
index c2ed54a2a79f..233beb5746c2 100644
--- a/net-misc/slimrat/metadata.xml
+++ b/net-misc/slimrat/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>premek@vohnout.cz</email>
<name>Premysl Vohnout</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
index 38c1ed990cee..a392846593a6 100644
--- a/net-misc/smb4k/metadata.xml
+++ b/net-misc/smb4k/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>kde@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
diff --git a/net-misc/smbc/metadata.xml b/net-misc/smbc/metadata.xml
index 7c8b361af685..23d70dca86ad 100644
--- a/net-misc/smbc/metadata.xml
+++ b/net-misc/smbc/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>samba@gentoo.org</email>
<name>Samba</name>
</maintainer>
diff --git a/net-misc/sobby/metadata.xml b/net-misc/sobby/metadata.xml
index 46ff3c52314f..2c70b7b5af87 100644
--- a/net-misc/sobby/metadata.xml
+++ b/net-misc/sobby/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>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
diff --git a/net-misc/socat/metadata.xml b/net-misc/socat/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-misc/socat/metadata.xml
+++ b/net-misc/socat/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-misc/socket/metadata.xml b/net-misc/socket/metadata.xml
index b6b8956cde34..5b159fbcadd1 100644
--- a/net-misc/socket/metadata.xml
+++ b/net-misc/socket/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 9179818046c5..4ff31e72f5db 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/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>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
</maintainer>
diff --git a/net-misc/spiped/metadata.xml b/net-misc/spiped/metadata.xml
index 1b2d73180213..31619e764b4f 100644
--- a/net-misc/spiped/metadata.xml
+++ b/net-misc/spiped/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>monsieurp@gentoo.org</email>
</maintainer>
<longdescription>
diff --git a/net-misc/ssh-askpass-fullscreen/metadata.xml b/net-misc/ssh-askpass-fullscreen/metadata.xml
index 050bd1b807b6..796542559d7d 100644
--- a/net-misc/ssh-askpass-fullscreen/metadata.xml
+++ b/net-misc/ssh-askpass-fullscreen/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-misc/ssh-chain/metadata.xml b/net-misc/ssh-chain/metadata.xml
index 36555e712fd3..e6288a036511 100644
--- a/net-misc/ssh-chain/metadata.xml
+++ b/net-misc/ssh-chain/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>ottxor@gentoo.org</email>
<name>Christoph Junghans</name>
</maintainer>
diff --git a/net-misc/sshpass/metadata.xml b/net-misc/sshpass/metadata.xml
index a800ed4d4701..e1217a852f22 100644
--- a/net-misc/sshpass/metadata.xml
+++ b/net-misc/sshpass/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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>jingcheng01@gmail.com</email>
<name> Jing, Cheng</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-misc/sslh/metadata.xml b/net-misc/sslh/metadata.xml
index 07339f6f0ce8..69570e849328 100644
--- a/net-misc/sslh/metadata.xml
+++ b/net-misc/sslh/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>
</pkgmetadata>
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index 095c1238fa81..5527d4909686 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>m.j.everitt@iee.org</email>
<name>Michael Everitt</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/ssvnc/metadata.xml b/net-misc/ssvnc/metadata.xml
index 5bd7c8a2a1ab..eb4341a7b3cc 100644
--- a/net-misc/ssvnc/metadata.xml
+++ b/net-misc/ssvnc/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>vapier@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index 7d74383db7b0..92c0c7692cce 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/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>Primary maintainer.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/streamtuner/metadata.xml b/net-misc/streamtuner/metadata.xml
index 4c1a11aec65c..1a364aa6f3da 100644
--- a/net-misc/streamtuner/metadata.xml
+++ b/net-misc/streamtuner/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>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
diff --git a/net-misc/strongswan/metadata.xml b/net-misc/strongswan/metadata.xml
index 3cad53d6d299..9e6793b9791f 100644
--- a/net-misc/strongswan/metadata.xml
+++ b/net-misc/strongswan/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>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>gurligebis@gentoo.org</email>
<name>Bjarke Istrup Pedersen</name>
</maintainer>
diff --git a/net-misc/stunnel/metadata.xml b/net-misc/stunnel/metadata.xml
index 6cfb65b3f5ca..7b9debfb547e 100644
--- a/net-misc/stunnel/metadata.xml
+++ b/net-misc/stunnel/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-misc/stuntman/metadata.xml b/net-misc/stuntman/metadata.xml
index 3ed4669f55a4..5087760546f6 100644
--- a/net-misc/stuntman/metadata.xml
+++ b/net-misc/stuntman/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-misc/suite3270/metadata.xml b/net-misc/suite3270/metadata.xml
index f27e339c1a10..bd77896aafc4 100644
--- a/net-misc/suite3270/metadata.xml
+++ b/net-misc/suite3270/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>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
<description>Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>jieryn@gmail.com</email>
<name>Jesse Farinacci</name>
<description>Maintainer by proxy, please CC on all bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>s390@gentoo.org</email>
<name>Gentoo Linux s390 Development</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/switzerland/metadata.xml b/net-misc/switzerland/metadata.xml
index 292b664e96bb..e77e27bbace0 100644
--- a/net-misc/switzerland/metadata.xml
+++ b/net-misc/switzerland/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-misc/sx/metadata.xml b/net-misc/sx/metadata.xml
index fdfe57eae112..31668243a8ff 100644
--- a/net-misc/sx/metadata.xml
+++ b/net-misc/sx/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>tomboy64@sina.cn</email>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/tcpsound/metadata.xml b/net-misc/tcpsound/metadata.xml
index 8b51961892ff..2c2a7923cfc8 100644
--- a/net-misc/tcpsound/metadata.xml
+++ b/net-misc/tcpsound/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-misc/teamviewer/metadata.xml b/net-misc/teamviewer/metadata.xml
index 5d86d8b1d20e..136310c3a028 100644
--- a/net-misc/teamviewer/metadata.xml
+++ b/net-misc/teamviewer/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>wschlich@gentoo.org</email>
<name>Wolfram Schlich</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>np-hardass@gentoo.org</email>
<name>NP-Hardass</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>wine@gentoo.org</email>
<name>Wine</name>
</maintainer>
diff --git a/net-misc/telnet-bsd/metadata.xml b/net-misc/telnet-bsd/metadata.xml
index 0926560098f5..56df135ff5a0 100644
--- a/net-misc/telnet-bsd/metadata.xml
+++ b/net-misc/telnet-bsd/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>mschiff@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/termtter/metadata.xml b/net-misc/termtter/metadata.xml
index 144630fc407e..3faf0224e017 100644
--- a/net-misc/termtter/metadata.xml
+++ b/net-misc/termtter/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>naota@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/net-misc/throttle/metadata.xml b/net-misc/throttle/metadata.xml
index cd950b903bee..686de21a97d3 100644
--- a/net-misc/throttle/metadata.xml
+++ b/net-misc/throttle/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>
</maintainer>
<longdescription>
diff --git a/net-misc/tiers/metadata.xml b/net-misc/tiers/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/tiers/metadata.xml
+++ b/net-misc/tiers/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-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 44af31215995..74700b3a317d 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/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>armin76@gentoo.org</email>
</maintainer>
<use>
diff --git a/net-misc/tightvnc/metadata.xml b/net-misc/tightvnc/metadata.xml
index d1dc499dbdf8..a2c42db620fa 100644
--- a/net-misc/tightvnc/metadata.xml
+++ b/net-misc/tightvnc/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>armin76@gentoo.org</email>
</maintainer>
<use>
diff --git a/net-misc/tinc/metadata.xml b/net-misc/tinc/metadata.xml
index 02e09c34e05a..96b5e517cbb4 100644
--- a/net-misc/tinc/metadata.xml
+++ b/net-misc/tinc/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>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>dlan@gentoo.org</email>
<name>Yixun Lan</name>
</maintainer>
diff --git a/net-misc/tipcutils/metadata.xml b/net-misc/tipcutils/metadata.xml
index 455557fd570b..6331698d16ae 100644
--- a/net-misc/tipcutils/metadata.xml
+++ b/net-misc/tipcutils/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>tokiclover@gmail.com</email>
<description>Maintainer. Assign bugs on him</description>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/tlsdate/metadata.xml b/net-misc/tlsdate/metadata.xml
index 4fd0b3758172..82f04441d92c 100644
--- a/net-misc/tlsdate/metadata.xml
+++ b/net-misc/tlsdate/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>vapier@gentoo.org</email>
<description>feel free to fix things</description>
</maintainer>
diff --git a/net-misc/tn5250/metadata.xml b/net-misc/tn5250/metadata.xml
index 5d6ac4ce30c5..cba77b8df147 100644
--- a/net-misc/tn5250/metadata.xml
+++ b/net-misc/tn5250/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>neurogeek@gentoo.org</email>
<name>Jesus Rivero</name>
</maintainer>
diff --git a/net-misc/tokyotyrant/metadata.xml b/net-misc/tokyotyrant/metadata.xml
index 24cbb90cf0c4..40aa45df2b01 100644
--- a/net-misc/tokyotyrant/metadata.xml
+++ b/net-misc/tokyotyrant/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-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
index 66d3dc2fee69..42400dae2a69 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-misc/tor/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-misc/ttytter/metadata.xml b/net-misc/ttytter/metadata.xml
index 77bb27ac694d..12d3ead808ab 100644
--- a/net-misc/ttytter/metadata.xml
+++ b/net-misc/ttytter/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-misc/ucarp/metadata.xml b/net-misc/ucarp/metadata.xml
index 77e2a9a7903e..4a09d7ba8d61 100644
--- a/net-misc/ucarp/metadata.xml
+++ b/net-misc/ucarp/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>cluster@gentoo.org</email>
<name>Gentoo Cluster Project</name>
</maintainer>
diff --git a/net-misc/udpcast/metadata.xml b/net-misc/udpcast/metadata.xml
index c9f4f45b0ff3..024fcc67894b 100644
--- a/net-misc/udpcast/metadata.xml
+++ b/net-misc/udpcast/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-misc/uftp/metadata.xml b/net-misc/uftp/metadata.xml
index 99c97ccbb58f..2a33d8eedc97 100644
--- a/net-misc/uftp/metadata.xml
+++ b/net-misc/uftp/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>azamat.hackimov@gmail.com</email>
<name>Azamat Hackimov</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index 3409127f534c..ffac4d7ebc01 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/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>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
diff --git a/net-misc/urlview/metadata.xml b/net-misc/urlview/metadata.xml
index 4d90cf4a1cd0..24ae812e9c0b 100644
--- a/net-misc/urlview/metadata.xml
+++ b/net-misc/urlview/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>nimiux@gentoo.org</email>
<name>Chema Alonso</name>
</maintainer>
diff --git a/net-misc/usbip/metadata.xml b/net-misc/usbip/metadata.xml
index ca5f18f721d7..6dde16e5c4b6 100644
--- a/net-misc/usbip/metadata.xml
+++ b/net-misc/usbip/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>chithanh@gentoo.org</email>
<name>Chí-Thanh Christopher Nguyễn</name>
</maintainer>
diff --git a/net-misc/valve/metadata.xml b/net-misc/valve/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/valve/metadata.xml
+++ b/net-misc/valve/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-misc/vconfig/metadata.xml b/net-misc/vconfig/metadata.xml
index 4accf104ff6a..09801c2600ee 100644
--- a/net-misc/vconfig/metadata.xml
+++ b/net-misc/vconfig/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/vde/metadata.xml b/net-misc/vde/metadata.xml
index 697602ceb3be..09f686beddd5 100644
--- a/net-misc/vde/metadata.xml
+++ b/net-misc/vde/metadata.xml
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <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="person">
<email>mlspamcb@noci.xs4all.nl</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>jmbsvicetto@gentoo.org</email>
<name>Jorge Manuel B. S. Vicetto</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index 2c40f6eaa45a..07231fe77bcd 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/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-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
index 99046455826c..1208299aea7a 100644
--- a/net-misc/vino/metadata.xml
+++ b/net-misc/vino/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-misc/vmnet/metadata.xml b/net-misc/vmnet/metadata.xml
index c6d862855eb5..79d462e85571 100644
--- a/net-misc/vmnet/metadata.xml
+++ b/net-misc/vmnet/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-misc/vmpsd/metadata.xml b/net-misc/vmpsd/metadata.xml
index f1d10859a0d6..d48f3a594fa3 100644
--- a/net-misc/vmpsd/metadata.xml
+++ b/net-misc/vmpsd/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-misc/vpnc/metadata.xml b/net-misc/vpnc/metadata.xml
index d2b6883844bf..2bec55dcc3ff 100644
--- a/net-misc/vpnc/metadata.xml
+++ b/net-misc/vpnc/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>lorand.jakab@schweiz.ch</email>
<name>Lorand Jakab</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mmokrejs@gmail.com</email>
<name>Martin Mokrejs</name>
</maintainer>
- <maintainer>
+ <maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/vpncwatch/metadata.xml b/net-misc/vpncwatch/metadata.xml
index 128fee4d65eb..f126bf28f5b5 100644
--- a/net-misc/vpncwatch/metadata.xml
+++ b/net-misc/vpncwatch/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>
<upstream>
diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml
index 9b12c9dfdb62..131b5e980ee7 100644
--- a/net-misc/vrrpd/metadata.xml
+++ b/net-misc/vrrpd/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-misc/vtun/metadata.xml b/net-misc/vtun/metadata.xml
index 433c591e0a01..6c796b6d02c5 100644
--- a/net-misc/vtun/metadata.xml
+++ b/net-misc/vtun/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/wakeonlan/metadata.xml b/net-misc/wakeonlan/metadata.xml
index 0f0ffc8cb814..051b645b0f12 100644
--- a/net-misc/wakeonlan/metadata.xml
+++ b/net-misc/wakeonlan/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>axs@gentoo.org</email>
<name>Ian Stakenvicius</name>
<description>Primary maintainer</description>
diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 2cbd7327046a..85b6f1cfa8ce 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/whatmask/metadata.xml b/net-misc/whatmask/metadata.xml
index 52363bff0cba..f8bd6f3f34f9 100644
--- a/net-misc/whatmask/metadata.xml
+++ b/net-misc/whatmask/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>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
diff --git a/net-misc/whois/metadata.xml b/net-misc/whois/metadata.xml
index c9e13ee6a3c9..56c124413057 100644
--- a/net-misc/whois/metadata.xml
+++ b/net-misc/whois/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>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
index 15db7c7de815..a0024e353d99 100644
--- a/net-misc/wicd/metadata.xml
+++ b/net-misc/wicd/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>tomka@gentoo.org</email>
<name>Thomas Kahle</name>
</maintainer>
diff --git a/net-misc/wol/metadata.xml b/net-misc/wol/metadata.xml
index 31f0297e3ce5..efb8e8ab0cb2 100644
--- a/net-misc/wol/metadata.xml
+++ b/net-misc/wol/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-misc/wput/metadata.xml b/net-misc/wput/metadata.xml
index e705eb72f8d0..34c8e180e467 100644
--- a/net-misc/wput/metadata.xml
+++ b/net-misc/wput/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>wired@gentoo.org</email>
<name>Alex Alexander</name>
</maintainer>
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
index 028c4bed18ff..0c1e85ee38ec 100644
--- a/net-misc/x11-ssh-askpass/metadata.xml
+++ b/net-misc/x11-ssh-askpass/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>cardoe@gentoo.org</email>
<description>I guess I'll maintain it since I fixed it last</description>
</maintainer>
diff --git a/net-misc/x11rdp/metadata.xml b/net-misc/x11rdp/metadata.xml
index 5cb9324943ab..0319eec4c8be 100644
--- a/net-misc/x11rdp/metadata.xml
+++ b/net-misc/x11rdp/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/net-misc/x2goclient/metadata.xml b/net-misc/x2goclient/metadata.xml
index 81a9d86b61e9..fc4554de3274 100644
--- a/net-misc/x2goclient/metadata.xml
+++ b/net-misc/x2goclient/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-misc/x2goserver/metadata.xml b/net-misc/x2goserver/metadata.xml
index 2ded1c5d1935..6d2d0300a249 100644
--- a/net-misc/x2goserver/metadata.xml
+++ b/net-misc/x2goserver/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-misc/xrdp/metadata.xml b/net-misc/xrdp/metadata.xml
index a86e4fbebb80..da930d5ac823 100644
--- a/net-misc/xrdp/metadata.xml
+++ b/net-misc/xrdp/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>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/net-misc/yajhfc/metadata.xml b/net-misc/yajhfc/metadata.xml
index 75de67d8673a..4e3b315a5064 100644
--- a/net-misc/yajhfc/metadata.xml
+++ b/net-misc/yajhfc/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-misc/yandex-disk/metadata.xml b/net-misc/yandex-disk/metadata.xml
index f06fb1626360..0a5cebb580e0 100644
--- a/net-misc/yandex-disk/metadata.xml
+++ b/net-misc/yandex-disk/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>blueboar@gentoo.org</email>
<name>Vladimir Romanov</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</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-misc/youtube-dl/metadata.xml b/net-misc/youtube-dl/metadata.xml
index 4e9681798108..8e518c398fdf 100644
--- a/net-misc/youtube-dl/metadata.xml
+++ b/net-misc/youtube-dl/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="person">
<email>nirbheek@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 9af01fde4f57..2e6a6c2842d0 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/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>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
<description>Primary maintainer, assign him on bugs.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>zoltan@sinustrom.info</email>
<name>Zoltan Puskas</name>
<description>Proxied maintainer, CC him on bugs.</description>
diff --git a/net-misc/ytalk/metadata.xml b/net-misc/ytalk/metadata.xml
index bdc1b75aa8a4..355c480257b0 100644
--- a/net-misc/ytalk/metadata.xml
+++ b/net-misc/ytalk/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>keso@impul.se</email>
<name>Andreas King</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
diff --git a/net-misc/zssh/metadata.xml b/net-misc/zssh/metadata.xml
index 39a20f0e4817..0d47f13935cb 100644
--- a/net-misc/zssh/metadata.xml
+++ b/net-misc/zssh/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>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
diff --git a/net-misc/zsync/metadata.xml b/net-misc/zsync/metadata.xml
index d675d5ef7117..ca294a5c6757 100644
--- a/net-misc/zsync/metadata.xml
+++ b/net-misc/zsync/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>
<longdescription lang="en">