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 c6d862855eb..79d462e8557 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 7026f2a9f3c..8fa258745ec 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 967fdca5659..92c124322a5 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 425b0dbd3a8..fa0367d8f9e 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 5b80fb94c39..a535b885282 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 c870f481260..88aef130435 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 1079971424d..18fb229e976 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 3449cfe1d8c..30b48ef1210 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 243b1ca9f63..3c3d5ced641 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 3ed4669f55a..5087760546f 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 e9e074098f0..bfadac6d6ff 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 a2a28b936d0..7413756723d 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 3ed4669f55a..5087760546f 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 a2a28b936d0..7413756723d 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 1db71bb6e0e..c10b09fa8f3 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 8479914d0c4..0e2180602d8 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 dd374a53ea1..706fd135420 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 15557bab051..32b67186d84 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 157326a7e89..78e64a5cf1a 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 1ceb5b06249..527c08acfea 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 c845479d513..7b2095db074 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 500e2752217..e2a7803599c 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 243b1ca9f63..3c3d5ced641 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 5b80fb94c39..a535b885282 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 e9ea16a1059..dd744838a0e 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 49d6f9a9be7..aa456e90bce 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 0d6e4e2054d..937891f0513 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 1e87335024f..7a58fa4de8f 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 7803cdb5825..1a06e96ebdc 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 b5111b4fa10..995aec82049 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 d7caf7d3b1d..a00f3aeb1f8 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 b14c9fbb175..9c5ed222d2e 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 1b9fb5b7d4b..2cb7edde3a3 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 5707ccd1451..c2d1a82c0e8 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 79f0d33aa25..c08f704e03c 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 717ab7f7f42..a5b3d7e3b60 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 812227cb9e3..63b6b39db63 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 601134e0f97..1dbab67f61c 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 7123fa8f9ec..1021f53d6e8 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 99f83c647fd..0a98e63dee7 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 9f9ded9f39a..c45f7480f57 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 58a826b66ff..d15a3ebeaa1 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 7e42e9a3bae..bdf9d1cea7b 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 77b82cf8aac..2529600a4fb 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 67ee8b27ff2..13f626e8715 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 5938ebe814c..2f7884dc6ed 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 00940010b5a..09bef32083c 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 349fc1408b6..394644abafd 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 b5f1baa10e9..54b2eac407c 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 5f1a4d657dd..306c354edf5 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 f713f2a74b4..4ce4054df69 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 e0695ccfdf9..fcb331819d4 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 2cfe9ff5a1e..42f88a34db7 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 09b2235129e..f804fe3a219 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 dc267bfe85d..8d1c5a827b9 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 4d33617f079..201ea4947ca 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 206e82b6874..ec94f20ac1f 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 f31ffbf8641..08e902a88a8 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 308e6e3a0e2..20cbfc65739 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 fc319ce95c0..8577945b03b 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 c331b7a5bba..1e878c532c3 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 ea02039c8d1..7d273a80ff6 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 071297add33..59570dd884e 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 d27adefecf3..996e7cacd21 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 4f773f3cebf..32fe1293e9a 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 b57924f9b14..5133c5c348b 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 bebd69f042b..13830225acf 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 42714a4dadd..4b902f3f34b 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 95879f1c01d..587655f9cca 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 43acb2cc82e..6243741ac58 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 783c4d3a16c..724365e3d38 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 c9e13ee6a3c..56c12441305 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 9d6cb653b38..01908213068 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 6a8f28deddb..a025d6c4d8f 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 a2ce09f19ce..851d3e21be0 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 cf9652841d2..e630a37f0a2 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 7574996a6f3..77e4137ec88 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 b6b8956cde3..5b159fbcadd 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 e12aaf03d9a..16c433dd2cb 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 4ae5dc41901..4965c206c65 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 1ea66e6f8eb..477445318b2 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 5d17ca27e77..913fed4c205 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 6553eda3e50..6234ae3cbf0 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 bcf19edfcbe..bd537594c88 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 97e409c9d05..18e3b6b2ded 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 d08f52481e0..c2c329857b7 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 7a288dfa1ab..97c0fce8f6f 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 c534f67229c..edd361ec1a3 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 3016618650d..2b6cd86af0a 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 cae2a6d112d..df60255c433 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 eeff86f130f..03a08235b0a 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 6a85e12515b..9187433e5ba 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 fe3dc94b2bc..39980802b1d 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 9d954f4229b..02c562591bc 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 4d37232aa03..25e77310cc1 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 12152959d0a..00c01633267 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 df7fdbeaf2b..45125b9b6e9 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 df7fdbeaf2b..45125b9b6e9 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 e4fbb03b8cd..9fcc5c61b40 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 3409127f534..ffac4d7ebc0 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 8ad2b4de9bf..6759215a936 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 fe7a82bbf2f..34aed7f5eb1 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 85f78bd8583..f2da4c7b57c 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 f44fa08f6fb..65cb7289cee 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 4f8a4cad161..36a11c9a144 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 aaf9b449ac5..d14a9e07b21 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 0d2c237afa8..706360d136c 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 798a87bd625..39626a990be 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 75c5a9141f4..c57573a31de 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 c1caab4cfd7..e8b8983b2da 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 0af22b0ab1c..c89beb74d35 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 8b51961892f..2c2a7923cfc 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 5b58eafd18b..c2391d465b9 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 7f679d64a78..041c1966b76 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 184e6798445..c2ecba5c11f 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 9b7fe83b229..8fb0527115b 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 13913ef923b..3876a7a7b38 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 5b80fb94c39..a535b885282 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 54f933baad7..7bf519a4020 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 6cb58e33adf..2444066aa02 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 506f7157d6c..dccb14c6e98 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 c9e13ee6a3c..56c12441305 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 38dce10c1d8..33e420089b5 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 d21514d0e8f..1ef67924b8b 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 e218a13609c..2fdbf33d963 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 ce6fe1636d3..8d375f5d42e 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 f38d43267b1..0cf59224b00 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 f38d43267b1..0cf59224b00 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 710850e4961..bddd8b4a205 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 48d2efa9157..d204a62cf58 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 125e82bf548..30de8b041c0 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 9fa8050550d..74c2baebb4e 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 63cad2ea36e..b1d1e33aef3 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 b0e0a588753..770b49cab61 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 cdb074ca6c7..e6ef377f51c 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 006bc2396c1..258e65f32b1 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 3ed4669f55a..5087760546f 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 597c68880bb..c3447532496 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 fb12766c505..0a0544e123f 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 6e2d5a31369..144557cb395 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 7e21d5b7500..882d23fe110 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 cf1e276625f..538130bba26 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 08fd0be8e07..14dde2333ec 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 336d2e78776..f4913582570 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 579df4723ce..bab792ed6d5 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 67d99f9fa5c..6dd9383f7c3 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 ce47791ca7a..89b3f821e9c 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 ac07e856ce8..74eccf1850f 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 6cb58e33adf..2444066aa02 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 469acd8e764..892e59c3539 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 1e7587374fd..d920e3ba3e5 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 3daf0e8091b..eaaaddf0d4d 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 abf93b94339..c13bff68bce 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 fe3dc94b2bc..39980802b1d 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 df4898fdec4..2e8801cb40a 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 5f54860e923..ee89d1f828e 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 e6a7a27838a..616f1fe1a5a 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 c07b37ef258..1ed5bc11cf8 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 acde6b58a99..c04ba062f30 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 5b80fb94c39..a535b885282 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 70b099927c1..f4ddc790691 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 55e7202afeb..d0f86294cbe 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 c524795cfac..a604eb0048a 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 c6d862855eb..79d462e8557 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 814c9e0b8ed..0602d77bce6 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 24a084b29e4..174f393836d 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 5b80fb94c39..a535b885282 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 5b80fb94c39..a535b885282 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 c9e13ee6a3c..56c12441305 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 c9e13ee6a3c..56c12441305 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 fcdeee5abcc..789a4440552 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 9fa8050550d..74c2baebb4e 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 9fa8050550d..74c2baebb4e 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 0c22cbb8c00..30c8deabf55 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 0c22cbb8c00..30c8deabf55 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 0c22cbb8c00..30c8deabf55 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 0c22cbb8c00..30c8deabf55 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 ffae8fa43aa..e8ba317f642 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 0c22cbb8c00..30c8deabf55 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 25cc0483a0c..420c24a93ef 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 40d676929ec..1df7a04f2cb 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 c6d862855eb..79d462e8557 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 cfa6d709ecf..88e81f1ab22 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 9b789bab0b4..3f576f05f29 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 437701bff2c..1b5df39c020 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 97ab237c609..657a3a3df93 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 f713f2a74b4..4ce4054df69 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 920e54db966..084e8d5b086 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 aefe4c94ef4..e4c418f29f1 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 0ffe1bfd761..5a1307da4ef 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 47c52c1154d..3f6c9be8aad 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 46c8876c38f..23bfc659d2d 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 a2ffa4bfa99..72d40333717 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 19e0cdcbf26..6d1856e9c24 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 3aaf7390793..bbbc6855175 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 c9e13ee6a3c..56c12441305 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 0997b8b0c5e..1d275bddd6d 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 a95d2466661..e1e2d9a1949 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 7f3d1f95164..8969781cea2 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 10706eb21d0..f20e0a0507b 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 e1a30b933e7..25d0eab738b 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 76fd4b106d4..25820382f57 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 e3f4cbf2e44..e5ffb637f84 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 c6d862855eb..79d462e8557 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 f2184386226..84cf23a5f3c 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 3db99ca629c..abddd073acf 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 c4459b9c583..97b641614ac 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 b85ed6c47c4..7861b3ffc82 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 a8fc0f18e75..874483cc937 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 adaca181135..ba12919c128 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 dbd59a69c49..53886946600 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 a22e3454702..08334168ca3 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 1cd6962e517..faa64f120cb 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 3e5aa55ddaa..251933666ff 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 21205b28176..b6d9446e89b 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 511627363af..3d16c3a1424 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 c7002452321..a1387191162 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 1644d8bc757..0f20bbcf2c9 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 5db29427ae6..fa439d9e97e 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 99ff893038d..b87a98e44d5 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 8299a763f40..28aba46eec6 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 e102151ca03..0a75ba291b5 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 a13dd5b71d1..f628dd4f826 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 8a4fab8dcb4..83607261adf 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 1baa46d8242..0b87a0d3d87 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 04c256fd0eb..31b4221e42e 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 17ee492d81e..69bc0ccc3d1 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 74f40b3dcda..8307f5e2d4f 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 8d880fd9bc0..a15fa8cca8e 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 27bc871d0b7..9698a702603 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 c6d862855eb..79d462e8557 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 c18fe09e213..f1f3b0c0a22 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 f040f077789..6b92650506b 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 ab0b675ebc2..ffc6f6f40d1 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 9e11bad60c0..8f93e4dab3d 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 d98da4ca574..148a18e18ad 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 0ea1a5e7e8c..359230bd52f 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 0b579e115a6..0f463c3b516 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 94e4603ee75..69bb171e770 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 5506ac77eb9..15e1a0cb3d0 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 669cdaf8641..730186acfd0 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 3b9f77da53a..aa3406196cb 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 c514a998b80..bb9f6a6873e 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 19643939653..c870d0eef0a 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 7e6b8b37f4a..9a14eb279ec 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 e7f31aa4c75..b03b823d129 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 5b619cd7fda..a4ac7ae7689 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 c2ed54a2a79..233beb5746c 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 38c1ed990ce..a392846593a 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 7c8b361af68..23d70dca86a 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 46ff3c52314..2c70b7b5af8 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 8b51961892f..2c2a7923cfc 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 b6b8956cde3..5b159fbcadd 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 9179818046c..4ff31e72f5d 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 1b2d7318021..31619e764b4 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 050bd1b807b..796542559d7 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 36555e712fd..e6288a03651 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 a800ed4d470..e1217a852f2 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 07339f6f0ce..69570e84932 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 095c1238fa8..5527d490968 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 5bd7c8a2a1a..eb4341a7b3c 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 7d74383db7b..92c0c7692cc 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 4c1a11aec65..1a364aa6f3d 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 3cad53d6d29..9e6793b9791 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 6cfb65b3f5c..7b9debfb547 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 3ed4669f55a..5087760546f 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 f27e339c1a1..bd77896aafc 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 292b664e96b..e77e27bbace 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 fdfe57eae11..31668243a8f 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 8b51961892f..2c2a7923cfc 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 5d86d8b1d20..136310c3a02 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 0926560098f..56df135ff5a 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 144630fc407..3faf0224e01 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 cd950b903be..686de21a97d 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 c6d862855eb..79d462e8557 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 44af3121599..74700b3a317 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 d1dc499dbdf..a2c42db620f 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 02e09c34e05..96b5e517cbb 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 455557fd570..6331698d16a 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 4fd0b375817..82f04441d92 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 5d6ac4ce30c..cba77b8df14 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 24cbb90cf0c..40aa45df2b0 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 66d3dc2fee6..42400dae2a6 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 77bb27ac694..12d3ead808a 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 77e2a9a7903..4a09d7ba8d6 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 c9f4f45b0ff..024fcc67894 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 99c97ccbb58..2a33d8eedc9 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 3409127f534..ffac4d7ebc0 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 4d90cf4a1cd..24ae812e9c0 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 ca5f18f721d..6dde16e5c4b 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 c6d862855eb..79d462e8557 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 4accf104ff6..09801c2600e 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 697602ceb3b..09f686beddd 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 2c40f6eaa45..07231fe77bc 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 99046455826..1208299aea7 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 c6d862855eb..79d462e8557 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 f1d10859a0d..d48f3a594fa 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 d2b6883844b..2bec55dcc3f 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 128fee4d65e..f126bf28f5b 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 9b12c9dfdb6..131b5e980ee 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 433c591e0a0..6c796b6d02c 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 0f0ffc8cb81..051b645b0f1 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 2cbd7327046..85b6f1cfa8c 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 52363bff0cb..f8bd6f3f34f 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 c9e13ee6a3c..56c12441305 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 15db7c7de81..a0024e353d9 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 31f0297e3ce..efb8e8ab0cb 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 e705eb72f8d..34c8e180e46 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 028c4bed18f..0c1e85ee38e 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 5cb9324943a..0319eec4c8b 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 81a9d86b61e..fc4554de327 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 2ded1c5d193..6d2d0300a24 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 a86e4fbebb8..da930d5ac82 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 75de67d8673..4e3b315a506 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 f06fb162636..0a5cebb580e 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 4e968179810..8e518c398fd 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 9af01fde4f5..2e6a6c2842d 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 bdc1b75aa8a..355c480257b 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 39a20f0e481..0d47f13935c 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 d675d5ef711..ca294a5c675 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">