summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /net-libs
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no maintainers in case of herds requested to be disbanded.
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/accounts-qt/metadata.xml5
-rw-r--r--net-libs/biblesync/metadata.xml1
-rw-r--r--net-libs/c-client/metadata.xml5
-rw-r--r--net-libs/canlock/metadata.xml1
-rw-r--r--net-libs/courier-authlib/metadata.xml5
-rw-r--r--net-libs/courier-unicode/metadata.xml5
-rw-r--r--net-libs/cppzmq/metadata.xml5
-rw-r--r--net-libs/daq/metadata.xml10
-rw-r--r--net-libs/dleyna-connector-dbus/metadata.xml5
-rw-r--r--net-libs/dleyna-core/metadata.xml5
-rw-r--r--net-libs/dleyna-renderer/metadata.xml5
-rw-r--r--net-libs/farstream/metadata.xml5
-rw-r--r--net-libs/ftplib/metadata.xml1
-rw-r--r--net-libs/glib-networking/metadata.xml5
-rw-r--r--net-libs/gloox/metadata.xml1
-rw-r--r--net-libs/gnet/metadata.xml5
-rw-r--r--net-libs/gnome-online-accounts/metadata.xml5
-rw-r--r--net-libs/gnutls/metadata.xml5
-rw-r--r--net-libs/gsnmp/metadata.xml5
-rw-r--r--net-libs/gsoap/metadata.xml5
-rw-r--r--net-libs/gssdp/metadata.xml5
-rw-r--r--net-libs/gtk-vnc/metadata.xml10
-rw-r--r--net-libs/gupnp-av/metadata.xml5
-rw-r--r--net-libs/gupnp-igd/metadata.xml6
-rw-r--r--net-libs/gupnp-ui/metadata.xml1
-rw-r--r--net-libs/gupnp/metadata.xml5
-rw-r--r--net-libs/http-parser/metadata.xml5
-rw-r--r--net-libs/iojs/metadata.xml7
-rw-r--r--net-libs/jreen/metadata.xml5
-rw-r--r--net-libs/liba53/metadata.xml5
-rw-r--r--net-libs/libaccounts-glib/metadata.xml5
-rw-r--r--net-libs/libbitcoinconsensus/metadata.xml5
-rw-r--r--net-libs/libblkmaker/metadata.xml5
-rw-r--r--net-libs/libbluedevil/metadata.xml5
-rw-r--r--net-libs/libbt/metadata.xml1
-rw-r--r--net-libs/libcapi/metadata.xml1
-rw-r--r--net-libs/libcrafter/metadata.xml5
-rw-r--r--net-libs/libdmapsharing/metadata.xml5
-rw-r--r--net-libs/libesmtp/metadata.xml5
-rw-r--r--net-libs/libetpan/metadata.xml5
-rw-r--r--net-libs/libflowmanager/metadata.xml5
-rw-r--r--net-libs/libgadu/metadata.xml1
-rw-r--r--net-libs/libgfbgraph/metadata.xml5
-rw-r--r--net-libs/libgmail/metadata.xml1
-rw-r--r--net-libs/libgrss/metadata.xml7
-rw-r--r--net-libs/libgsasl/metadata.xml5
-rw-r--r--net-libs/libgssglue/metadata.xml1
-rw-r--r--net-libs/libhackrf/metadata.xml5
-rw-r--r--net-libs/libircclient/metadata.xml5
-rw-r--r--net-libs/libkfbapi/metadata.xml5
-rw-r--r--net-libs/libkgapi/metadata.xml5
-rw-r--r--net-libs/libkolab/metadata.xml5
-rw-r--r--net-libs/libkolabxml/metadata.xml5
-rw-r--r--net-libs/libkpeople/metadata.xml5
-rw-r--r--net-libs/libktorrent/metadata.xml5
-rw-r--r--net-libs/libkvkontakte/metadata.xml5
-rw-r--r--net-libs/liblockfile/metadata.xml5
-rw-r--r--net-libs/libmediawiki/metadata.xml5
-rw-r--r--net-libs/libmirisdr/metadata.xml5
-rw-r--r--net-libs/libmm-qt/metadata.xml5
-rw-r--r--net-libs/libmnl/metadata.xml5
-rw-r--r--net-libs/libndp/metadata.xml5
-rw-r--r--net-libs/libnet/metadata.xml5
-rw-r--r--net-libs/libnetfilter_acct/metadata.xml5
-rw-r--r--net-libs/libnetfilter_conntrack/metadata.xml5
-rw-r--r--net-libs/libnetfilter_cthelper/metadata.xml5
-rw-r--r--net-libs/libnetfilter_cttimeout/metadata.xml5
-rw-r--r--net-libs/libnetfilter_log/metadata.xml5
-rw-r--r--net-libs/libnetfilter_queue/metadata.xml5
-rw-r--r--net-libs/libnfnetlink/metadata.xml5
-rw-r--r--net-libs/libnfsidmap/metadata.xml5
-rw-r--r--net-libs/libnftnl/metadata.xml5
-rw-r--r--net-libs/libnice/metadata.xml5
-rw-r--r--net-libs/libnids/metadata.xml5
-rw-r--r--net-libs/libnm-qt/metadata.xml5
-rw-r--r--net-libs/libntlm/metadata.xml5
-rw-r--r--net-libs/liboping/metadata.xml5
-rw-r--r--net-libs/libosmo-abis/metadata.xml5
-rw-r--r--net-libs/libosmo-dsp/metadata.xml5
-rw-r--r--net-libs/libosmocore/metadata.xml5
-rw-r--r--net-libs/libpcap/metadata.xml5
-rw-r--r--net-libs/libpcapnav/metadata.xml5
-rw-r--r--net-libs/libprotoident/metadata.xml5
-rw-r--r--net-libs/libproxy/metadata.xml1
-rw-r--r--net-libs/libqinfinity/metadata.xml5
-rw-r--r--net-libs/librouteros/metadata.xml5
-rw-r--r--net-libs/librpcsecgss/metadata.xml5
-rw-r--r--net-libs/librsync/metadata.xml5
-rw-r--r--net-libs/libsignon-glib/metadata.xml5
-rw-r--r--net-libs/libsmi/metadata.xml5
-rw-r--r--net-libs/libsoup-gnome/metadata.xml5
-rw-r--r--net-libs/libsoup/metadata.xml5
-rw-r--r--net-libs/libsrtp/metadata.xml5
-rw-r--r--net-libs/libssh/metadata.xml10
-rw-r--r--net-libs/libssh2/metadata.xml5
-rw-r--r--net-libs/libtirpc/metadata.xml5
-rw-r--r--net-libs/libtorrent/metadata.xml1
-rw-r--r--net-libs/libtrace/metadata.xml5
-rw-r--r--net-libs/libupnp/metadata.xml5
-rw-r--r--net-libs/libvncserver/metadata.xml5
-rw-r--r--net-libs/libwebsockets/metadata.xml5
-rw-r--r--net-libs/libwhisker/metadata.xml5
-rw-r--r--net-libs/libyahoo2/metadata.xml1
-rw-r--r--net-libs/libzapojit/metadata.xml5
-rw-r--r--net-libs/loudmouth/metadata.xml5
-rw-r--r--net-libs/miniupnpc/metadata.xml5
-rw-r--r--net-libs/neon/metadata.xml5
-rw-r--r--net-libs/netembryo/metadata.xml1
-rw-r--r--net-libs/netwib/metadata.xml5
-rw-r--r--net-libs/nodejs/metadata.xml7
-rw-r--r--net-libs/openslp/metadata.xml5
-rw-r--r--net-libs/phodav/metadata.xml10
-rw-r--r--net-libs/qmf/metadata.xml5
-rw-r--r--net-libs/qtweetlib/metadata.xml5
-rw-r--r--net-libs/qxmpp/metadata.xml5
-rw-r--r--net-libs/rb_libtorrent/metadata.xml1
-rw-r--r--net-libs/rest/metadata.xml5
-rw-r--r--net-libs/ripe-atlas-sagan/metadata.xml5
-rw-r--r--net-libs/rpc2/metadata.xml5
-rw-r--r--net-libs/serf/metadata.xml5
-rw-r--r--net-libs/signon-oauth2/metadata.xml5
-rw-r--r--net-libs/signon-ui/metadata.xml5
-rw-r--r--net-libs/signond/metadata.xml5
-rw-r--r--net-libs/socket++/metadata.xml5
-rw-r--r--net-libs/socket_wrapper/metadata.xml5
-rw-r--r--net-libs/sofia-sip/metadata.xml5
-rw-r--r--net-libs/telepathy-accounts-signon/metadata.xml5
-rw-r--r--net-libs/telepathy-farstream/metadata.xml5
-rw-r--r--net-libs/telepathy-glib/metadata.xml5
-rw-r--r--net-libs/telepathy-logger-qt/metadata.xml5
-rw-r--r--net-libs/telepathy-qt/metadata.xml10
-rw-r--r--net-libs/uhttpmock/metadata.xml5
-rw-r--r--net-libs/webkit-gtk/metadata.xml5
-rw-r--r--net-libs/wvstreams/metadata.xml1
-rw-r--r--net-libs/xrootd/metadata.xml5
135 files changed, 499 insertions, 144 deletions
diff --git a/net-libs/accounts-qt/metadata.xml b/net-libs/accounts-qt/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/accounts-qt/metadata.xml
+++ b/net-libs/accounts-qt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/biblesync/metadata.xml b/net-libs/biblesync/metadata.xml
index d68839c9277..15e59c978b0 100644
--- a/net-libs/biblesync/metadata.xml
+++ b/net-libs/biblesync/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>theology</herd>
<maintainer>
<email>theology@gentoo.org</email>
</maintainer>
diff --git a/net-libs/c-client/metadata.xml b/net-libs/c-client/metadata.xml
index 2156c37a787..4f8dc96277c 100644
--- a/net-libs/c-client/metadata.xml
+++ b/net-libs/c-client/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<use>
<flag name="doc">Install RFCs related to IMAP</flag>
<flag name="topal">Enable support for <pkg>net-mail/topal</pkg>
diff --git a/net-libs/canlock/metadata.xml b/net-libs/canlock/metadata.xml
index 4d0ebe73a55..097975e3adc 100644
--- a/net-libs/canlock/metadata.xml
+++ b/net-libs/canlock/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-news</herd>
</pkgmetadata>
diff --git a/net-libs/courier-authlib/metadata.xml b/net-libs/courier-authlib/metadata.xml
index 8f8d517f9cf..bd5cf2eb0ab 100644
--- a/net-libs/courier-authlib/metadata.xml
+++ b/net-libs/courier-authlib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<use>
<flag name="vpopmail">Enable vpopmail support</flag>
</use>
diff --git a/net-libs/courier-unicode/metadata.xml b/net-libs/courier-unicode/metadata.xml
index eed2873227a..7c450e2f31e 100644
--- a/net-libs/courier-unicode/metadata.xml
+++ b/net-libs/courier-unicode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-mail</herd>
<maintainer>
<email>hanno@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">courier</remote-id>
</upstream>
diff --git a/net-libs/cppzmq/metadata.xml b/net-libs/cppzmq/metadata.xml
index f92d8e349d8..b547a06ccf7 100644
--- a/net-libs/cppzmq/metadata.xml
+++ b/net-libs/cppzmq/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">zeromq/cppzmq</remote-id>
</upstream>
diff --git a/net-libs/daq/metadata.xml b/net-libs/daq/metadata.xml
index 9ddd5332d8f..e1c45cabc02 100644
--- a/net-libs/daq/metadata.xml
+++ b/net-libs/daq/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>jason.r.wallace@gmail.com</email>
<name>Jason Wallace</name>
@@ -10,7 +9,14 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
-<herd>netmon</herd>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
<use>
<flag name="afpacket">
diff --git a/net-libs/dleyna-connector-dbus/metadata.xml b/net-libs/dleyna-connector-dbus/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/net-libs/dleyna-connector-dbus/metadata.xml
+++ b/net-libs/dleyna-connector-dbus/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/dleyna-core/metadata.xml b/net-libs/dleyna-core/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/net-libs/dleyna-core/metadata.xml
+++ b/net-libs/dleyna-core/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/dleyna-renderer/metadata.xml b/net-libs/dleyna-renderer/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/net-libs/dleyna-renderer/metadata.xml
+++ b/net-libs/dleyna-renderer/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/farstream/metadata.xml b/net-libs/farstream/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/farstream/metadata.xml
+++ b/net-libs/farstream/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/ftplib/metadata.xml b/net-libs/ftplib/metadata.xml
index c572c7d9b47..07cb6cb09a1 100644
--- a/net-libs/ftplib/metadata.xml
+++ b/net-libs/ftplib/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/net-libs/glib-networking/metadata.xml b/net-libs/glib-networking/metadata.xml
index 4a1545e7ec5..b54fb2007e2 100644
--- a/net-libs/glib-networking/metadata.xml
+++ b/net-libs/glib-networking/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="libproxy">Use <pkg>net-libs/libproxy</pkg> for getting
the HTTP/HTTPS/SOCKS proxy configuration</flag>
diff --git a/net-libs/gloox/metadata.xml b/net-libs/gloox/metadata.xml
index 3e2b4181f5b..097975e3adc 100644
--- a/net-libs/gloox/metadata.xml
+++ b/net-libs/gloox/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-im</herd>
</pkgmetadata>
diff --git a/net-libs/gnet/metadata.xml b/net-libs/gnet/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/gnet/metadata.xml
+++ b/net-libs/gnet/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/gnome-online-accounts/metadata.xml b/net-libs/gnome-online-accounts/metadata.xml
index a27834f8df7..19b90fd35da 100644
--- a/net-libs/gnome-online-accounts/metadata.xml
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
to set GNOME online accounts preferences</flag>
diff --git a/net-libs/gnutls/metadata.xml b/net-libs/gnutls/metadata.xml
index 15dc63c698a..8fa87919646 100644
--- a/net-libs/gnutls/metadata.xml
+++ b/net-libs/gnutls/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>crypto</herd>
+ <maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+ </maintainer>
<use>
<flag name="crywrap" restrict="&gt;=net-libs/gnutls-3.2.10">
Build the crywrap TLS proxy service
diff --git a/net-libs/gsnmp/metadata.xml b/net-libs/gsnmp/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/gsnmp/metadata.xml
+++ b/net-libs/gsnmp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/gsoap/metadata.xml b/net-libs/gsoap/metadata.xml
index 1611f0c734c..6de53096589 100644
--- a/net-libs/gsoap/metadata.xml
+++ b/net-libs/gsoap/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>swapon@gmail.com</email>
<name>Alessio Cassibba</name>
@@ -14,6 +13,10 @@
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gsoap2</remote-id>
</upstream>
diff --git a/net-libs/gssdp/metadata.xml b/net-libs/gssdp/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/gssdp/metadata.xml
+++ b/net-libs/gssdp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml
index 3a15c3288b0..1a07f8509c1 100644
--- a/net-libs/gtk-vnc/metadata.xml
+++ b/net-libs/gtk-vnc/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>virtualization</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+ </maintainer>
<use>
<flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 assets</flag>
</use>
diff --git a/net-libs/gupnp-av/metadata.xml b/net-libs/gupnp-av/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/gupnp-av/metadata.xml
+++ b/net-libs/gupnp-av/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/gupnp-igd/metadata.xml b/net-libs/gupnp-igd/metadata.xml
index 45183de7300..fe3dc94b2bc 100644
--- a/net-libs/gupnp-igd/metadata.xml
+++ b/net-libs/gupnp-igd/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
-<herd>net-p2p</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/gupnp-ui/metadata.xml b/net-libs/gupnp-ui/metadata.xml
index 7289824cb87..097975e3adc 100644
--- a/net-libs/gupnp-ui/metadata.xml
+++ b/net-libs/gupnp-ui/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-p2p</herd>
</pkgmetadata>
diff --git a/net-libs/gupnp/metadata.xml b/net-libs/gupnp/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/gupnp/metadata.xml
+++ b/net-libs/gupnp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/http-parser/metadata.xml b/net-libs/http-parser/metadata.xml
index 28beb72899b..75a9438745c 100644
--- a/net-libs/http-parser/metadata.xml
+++ b/net-libs/http-parser/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Proxied Maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">joyent/http-parser</remote-id>
</upstream>
diff --git a/net-libs/iojs/metadata.xml b/net-libs/iojs/metadata.xml
index 35d280f5255..6c4bcc6b4e8 100644
--- a/net-libs/iojs/metadata.xml
+++ b/net-libs/iojs/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
</maintainer>
@@ -10,6 +9,10 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<maintainer status="active">
<email>bugs@bergstroem.nu</email>
diff --git a/net-libs/jreen/metadata.xml b/net-libs/jreen/metadata.xml
index 1f5e912b0a8..146fb502cc7 100644
--- a/net-libs/jreen/metadata.xml
+++ b/net-libs/jreen/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">euroelessar/jreen</remote-id>
</upstream>
diff --git a/net-libs/liba53/metadata.xml b/net-libs/liba53/metadata.xml
index 811555c0325..a573211e418 100644
--- a/net-libs/liba53/metadata.xml
+++ b/net-libs/liba53/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>radio</herd>
+ <maintainer>
+ <email>radio@gentoo.org</email>
+ <name>Radio</name>
+ </maintainer>
<upstream>
<remote-id type="github">RangeNetworks/liba53</remote-id>
</upstream>
diff --git a/net-libs/libaccounts-glib/metadata.xml b/net-libs/libaccounts-glib/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libaccounts-glib/metadata.xml
+++ b/net-libs/libaccounts-glib/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 9afdd38d755..e504c7efac8 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
<email>luke_gentoo_bitcoin@dashjr.org</email>
<name>Luke Dashjr</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag>
<flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag>
diff --git a/net-libs/libblkmaker/metadata.xml b/net-libs/libblkmaker/metadata.xml
index 10b98912615..7bf470cf016 100644
--- a/net-libs/libblkmaker/metadata.xml
+++ b/net-libs/libblkmaker/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,6 +9,10 @@
<email>luke-jr+gentoobugs@utopios.org</email>
<name>Luke Dashjr</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">bitcoin/libblkmaker</remote-id>
</upstream>
diff --git a/net-libs/libbluedevil/metadata.xml b/net-libs/libbluedevil/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libbluedevil/metadata.xml
+++ b/net-libs/libbluedevil/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libbt/metadata.xml b/net-libs/libbt/metadata.xml
index 9a425c41b63..12bfc8f3cc5 100644
--- a/net-libs/libbt/metadata.xml
+++ b/net-libs/libbt/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-p2p</herd>
<upstream>
<remote-id type="sourceforge">libbt</remote-id>
</upstream>
diff --git a/net-libs/libcapi/metadata.xml b/net-libs/libcapi/metadata.xml
index 756ddd4a622..097975e3adc 100644
--- a/net-libs/libcapi/metadata.xml
+++ b/net-libs/libcapi/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-dialup</herd>
</pkgmetadata>
diff --git a/net-libs/libcrafter/metadata.xml b/net-libs/libcrafter/metadata.xml
index 6bfb7dbc5f4..12ca0b4cd40 100644
--- a/net-libs/libcrafter/metadata.xml
+++ b/net-libs/libcrafter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription lang="en">
Libcrafter is a high level library for C++ designed to facilitate the creation
and decoding of network packets. It is able to craft or decode packets of most
diff --git a/net-libs/libdmapsharing/metadata.xml b/net-libs/libdmapsharing/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/libdmapsharing/metadata.xml
+++ b/net-libs/libdmapsharing/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libesmtp/metadata.xml b/net-libs/libesmtp/metadata.xml
index 90c529dd9ca..99bbb9e7cd0 100644
--- a/net-libs/libesmtp/metadata.xml
+++ b/net-libs/libesmtp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
<use>
<flag name="ntlm">Enable support for NTLM authentication</flag>
</use>
diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index a9c325b5da7..b9717cf7c6b 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<longdescription lang="en">
libEtPan ! is a mail purpose library. It will be used for low-level mail
handling : network protocols (IMAP/NNTP/POP3/SMTP over TCP/IP and
diff --git a/net-libs/libflowmanager/metadata.xml b/net-libs/libflowmanager/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-libs/libflowmanager/metadata.xml
+++ b/net-libs/libflowmanager/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libgadu/metadata.xml b/net-libs/libgadu/metadata.xml
index 4784a7025da..e912cc81127 100644
--- a/net-libs/libgadu/metadata.xml
+++ b/net-libs/libgadu/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-im</herd>
<maintainer>
<email>reavertm@gentoo.org</email>
<name>Maciej Mrozowski</name>
diff --git a/net-libs/libgfbgraph/metadata.xml b/net-libs/libgfbgraph/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/libgfbgraph/metadata.xml
+++ b/net-libs/libgfbgraph/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libgmail/metadata.xml b/net-libs/libgmail/metadata.xml
index b5a8781360c..edca24cba7e 100644
--- a/net-libs/libgmail/metadata.xml
+++ b/net-libs/libgmail/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-p2p</herd>
<upstream>
<remote-id type="sourceforge">libgmail</remote-id>
</upstream>
diff --git a/net-libs/libgrss/metadata.xml b/net-libs/libgrss/metadata.xml
index 09d775b34fb..d0fee07b900 100644
--- a/net-libs/libgrss/metadata.xml
+++ b/net-libs/libgrss/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
- <upstream>
+<upstream>
<bugs-to>https://bugs.gnome.org</bugs-to>
<changelog>https://git.gnome.org/browse/libgrss</changelog>
</upstream>
@@ -10,4 +9,8 @@
<email>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml
index a0231acea7e..d2d81e42c2c 100644
--- a/net-libs/libgsasl/metadata.xml
+++ b/net-libs/libgsasl/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-mail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<use>
<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
<flag name="ntlm">Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag>
diff --git a/net-libs/libgssglue/metadata.xml b/net-libs/libgssglue/metadata.xml
index ca66751dee2..097975e3adc 100644
--- a/net-libs/libgssglue/metadata.xml
+++ b/net-libs/libgssglue/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-fs</herd>
</pkgmetadata>
diff --git a/net-libs/libhackrf/metadata.xml b/net-libs/libhackrf/metadata.xml
index f347a49f850..8c617321d73 100644
--- a/net-libs/libhackrf/metadata.xml
+++ b/net-libs/libhackrf/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>radio</herd>
<maintainer>
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
+ <maintainer>
+ <email>radio@gentoo.org</email>
+ <name>Radio</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/net-libs/libircclient/metadata.xml b/net-libs/libircclient/metadata.xml
index 85eaa183f0a..8dbee9bba33 100644
--- a/net-libs/libircclient/metadata.xml
+++ b/net-libs/libircclient/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libircclient</remote-id>
</upstream>
diff --git a/net-libs/libkfbapi/metadata.xml b/net-libs/libkfbapi/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libkfbapi/metadata.xml
+++ b/net-libs/libkfbapi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libkgapi/metadata.xml b/net-libs/libkgapi/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libkgapi/metadata.xml
+++ b/net-libs/libkgapi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libkolab/metadata.xml b/net-libs/libkolab/metadata.xml
index 8d36d5b01cd..710850e4961 100644
--- a/net-libs/libkolab/metadata.xml
+++ b/net-libs/libkolab/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libkolabxml/metadata.xml b/net-libs/libkolabxml/metadata.xml
index 10fdb56d007..d066a35e502 100644
--- a/net-libs/libkolabxml/metadata.xml
+++ b/net-libs/libkolabxml/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
<use>
<flag name="csharp">Enable C# language bindings</flag>
</use>
diff --git a/net-libs/libkpeople/metadata.xml b/net-libs/libkpeople/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libkpeople/metadata.xml
+++ b/net-libs/libkpeople/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libktorrent/metadata.xml b/net-libs/libktorrent/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libktorrent/metadata.xml
+++ b/net-libs/libktorrent/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libkvkontakte/metadata.xml b/net-libs/libkvkontakte/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libkvkontakte/metadata.xml
+++ b/net-libs/libkvkontakte/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
index 51f94e3fbe0..5f39b000ab6 100644
--- a/net-libs/liblockfile/metadata.xml
+++ b/net-libs/liblockfile/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libmediawiki/metadata.xml b/net-libs/libmediawiki/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libmediawiki/metadata.xml
+++ b/net-libs/libmediawiki/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libmirisdr/metadata.xml b/net-libs/libmirisdr/metadata.xml
index 631cfabe0c2..20ec6821199 100644
--- a/net-libs/libmirisdr/metadata.xml
+++ b/net-libs/libmirisdr/metadata.xml
@@ -5,7 +5,10 @@
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
-<herd>radio</herd>
+<maintainer>
+<email>radio@gentoo.org</email>
+<name>Radio</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/net-libs/libmm-qt/metadata.xml b/net-libs/libmm-qt/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-libs/libmm-qt/metadata.xml
+++ b/net-libs/libmm-qt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
index 4fc285912ae..5af908485ba 100644
--- a/net-libs/libmnl/metadata.xml
+++ b/net-libs/libmnl/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription lang="en">
libmnl is a minimalistic user-space library oriented to Netlink developers.
There are a lot of common tasks in parsing, validating, constructing of both
diff --git a/net-libs/libndp/metadata.xml b/net-libs/libndp/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/libndp/metadata.xml
+++ b/net-libs/libndp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnet/metadata.xml b/net-libs/libnet/metadata.xml
index aaad48cdde3..4f888bed2b8 100644
--- a/net-libs/libnet/metadata.xml
+++ b/net-libs/libnet/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription>
Libnet is a high-level API (toolkit) allowing the application
programmer to construct and inject network packets. It provides a
diff --git a/net-libs/libnetfilter_acct/metadata.xml b/net-libs/libnetfilter_acct/metadata.xml
index 1870437aa8f..9eec5852aa6 100644
--- a/net-libs/libnetfilter_acct/metadata.xml
+++ b/net-libs/libnetfilter_acct/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription lang="en">
libnetfilter_acct is the userspace library that provides a programming
interface (API) to the extended accounting infrastructure. This information can
diff --git a/net-libs/libnetfilter_conntrack/metadata.xml b/net-libs/libnetfilter_conntrack/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/libnetfilter_conntrack/metadata.xml
+++ b/net-libs/libnetfilter_conntrack/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnetfilter_cthelper/metadata.xml b/net-libs/libnetfilter_cthelper/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-libs/libnetfilter_cthelper/metadata.xml
+++ b/net-libs/libnetfilter_cthelper/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/libnetfilter_cttimeout/metadata.xml
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnetfilter_log/metadata.xml b/net-libs/libnetfilter_log/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/libnetfilter_log/metadata.xml
+++ b/net-libs/libnetfilter_log/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnetfilter_queue/metadata.xml b/net-libs/libnetfilter_queue/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/libnetfilter_queue/metadata.xml
+++ b/net-libs/libnetfilter_queue/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnfnetlink/metadata.xml b/net-libs/libnfnetlink/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/libnfnetlink/metadata.xml
+++ b/net-libs/libnfnetlink/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-libs/libnfsidmap/metadata.xml
+++ b/net-libs/libnfsidmap/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml
index 48a9f1169a7..dca5f407411 100644
--- a/net-libs/libnftnl/metadata.xml
+++ b/net-libs/libnftnl/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
<maintainer>
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<use>
<flag name="json">Supports parsing of JSON</flag>
</use>
diff --git a/net-libs/libnice/metadata.xml b/net-libs/libnice/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/libnice/metadata.xml
+++ b/net-libs/libnice/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libnids/metadata.xml b/net-libs/libnids/metadata.xml
index d669db19d88..10d7d2bf0d0 100644
--- a/net-libs/libnids/metadata.xml
+++ b/net-libs/libnids/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription>emulates the IP stack of Linux 2.0.x and offers IP defragmentation, TCP stream assembly and TCP port scan detection.</longdescription>
<use>
<flag name="glib">Use <pkg>dev-libs/glib</pkg> for multiprocessing support</flag>
diff --git a/net-libs/libnm-qt/metadata.xml b/net-libs/libnm-qt/metadata.xml
index c5ae96e2c63..d713f1228a6 100644
--- a/net-libs/libnm-qt/metadata.xml
+++ b/net-libs/libnm-qt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="modemmanager">Enable support for mobile broadband devices</flag>
</use>
diff --git a/net-libs/libntlm/metadata.xml b/net-libs/libntlm/metadata.xml
index 3f5765681d7..aa5a37dc4e7 100644
--- a/net-libs/libntlm/metadata.xml
+++ b/net-libs/libntlm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>net-mail</herd>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
<longdescription>
libntlm is a library that implement Microsoft's NTLM authentication. However,
the packaging of libntlm lacked certain things, such as having build problems,
diff --git a/net-libs/liboping/metadata.xml b/net-libs/liboping/metadata.xml
index 62e5578cfa8..56e1adf3db4 100644
--- a/net-libs/liboping/metadata.xml
+++ b/net-libs/liboping/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Proxied Maintainer</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libosmo-abis/metadata.xml b/net-libs/libosmo-abis/metadata.xml
index 19e2deffdc9..370d4d1560c 100644
--- a/net-libs/libosmo-abis/metadata.xml
+++ b/net-libs/libosmo-abis/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>radio</herd>
+ <maintainer>
+ <email>radio@gentoo.org</email>
+ <name>Radio</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libosmo-dsp/metadata.xml b/net-libs/libosmo-dsp/metadata.xml
index 631cfabe0c2..20ec6821199 100644
--- a/net-libs/libosmo-dsp/metadata.xml
+++ b/net-libs/libosmo-dsp/metadata.xml
@@ -5,7 +5,10 @@
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
</maintainer>
-<herd>radio</herd>
+<maintainer>
+<email>radio@gentoo.org</email>
+<name>Radio</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/net-libs/libosmocore/metadata.xml b/net-libs/libosmocore/metadata.xml
index 79f195bfce2..fbdd074fc1b 100644
--- a/net-libs/libosmocore/metadata.xml
+++ b/net-libs/libosmocore/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>radio</herd>
+ <maintainer>
+ <email>radio@gentoo.org</email>
+ <name>Radio</name>
+ </maintainer>
<use>
<flag name="embedded">Build for embedded use and disable unsupported features</flag>
<flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index ceb9f2c1fb6..34685573ef0 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<use>
<flag name="netlink">
Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.
diff --git a/net-libs/libpcapnav/metadata.xml b/net-libs/libpcapnav/metadata.xml
index 89664012b67..c7d6466eb79 100644
--- a/net-libs/libpcapnav/metadata.xml
+++ b/net-libs/libpcapnav/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">netdude</remote-id>
</upstream>
diff --git a/net-libs/libprotoident/metadata.xml b/net-libs/libprotoident/metadata.xml
index 2281ff091ad..b4ab5bbe502 100644
--- a/net-libs/libprotoident/metadata.xml
+++ b/net-libs/libprotoident/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<use>
<flag name="tools">Build and install command-line tools</flag>
</use>
diff --git a/net-libs/libproxy/metadata.xml b/net-libs/libproxy/metadata.xml
index a4957587f72..f2ace5d9554 100644
--- a/net-libs/libproxy/metadata.xml
+++ b/net-libs/libproxy/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/net-libs/libqinfinity/metadata.xml b/net-libs/libqinfinity/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/net-libs/libqinfinity/metadata.xml
+++ b/net-libs/libqinfinity/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/librouteros/metadata.xml b/net-libs/librouteros/metadata.xml
index 60c7f53239e..c5570c3e872 100644
--- a/net-libs/librouteros/metadata.xml
+++ b/net-libs/librouteros/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -10,4 +9,8 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/librpcsecgss/metadata.xml b/net-libs/librpcsecgss/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-libs/librpcsecgss/metadata.xml
+++ b/net-libs/librpcsecgss/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/librsync/metadata.xml b/net-libs/librsync/metadata.xml
index cf0ec768542..1b609e517fc 100644
--- a/net-libs/librsync/metadata.xml
+++ b/net-libs/librsync/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>axelgenus@gmail.com</email>
<name>Alessandro Calorì</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">librsync</remote-id>
<remote-id type="github">librsync/librsync</remote-id>
diff --git a/net-libs/libsignon-glib/metadata.xml b/net-libs/libsignon-glib/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/libsignon-glib/metadata.xml
+++ b/net-libs/libsignon-glib/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libsmi/metadata.xml b/net-libs/libsmi/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/libsmi/metadata.xml
+++ b/net-libs/libsmi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libsoup-gnome/metadata.xml b/net-libs/libsoup-gnome/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/net-libs/libsoup-gnome/metadata.xml
+++ b/net-libs/libsoup-gnome/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index f96b3e310f9..ccd847c7928 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
Sign-On</flag>
diff --git a/net-libs/libsrtp/metadata.xml b/net-libs/libsrtp/metadata.xml
index 46b43264656..a90fc7a5bdc 100644
--- a/net-libs/libsrtp/metadata.xml
+++ b/net-libs/libsrtp/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>chromium</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+ <maintainer>
+ <email>chromium@gentoo.org</email>
+ <name>Chromium in Gentoo Project</name>
+ </maintainer>
<use>
<flag name="aesicm">Use AES ICM cryptographic algorithm</flag>
<flag name="console">
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 9ff8b998687..ba4425c72d6 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
-<herd>kde</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
<use>
<flag name="gcrypt">Prefer <pkg>dev-libs/libgcrypt</pkg> over
<pkg>dev-libs/openssl</pkg> for encryption</flag>
diff --git a/net-libs/libssh2/metadata.xml b/net-libs/libssh2/metadata.xml
index 1644999aaaa..77059365844 100644
--- a/net-libs/libssh2/metadata.xml
+++ b/net-libs/libssh2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<use>
<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
</use>
diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
index 7c7aaf810f7..4c0c5cab74c 100644
--- a/net-libs/libtirpc/metadata.xml
+++ b/net-libs/libtirpc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libtirpc</remote-id>
</upstream>
diff --git a/net-libs/libtorrent/metadata.xml b/net-libs/libtorrent/metadata.xml
index 50a5b2c6c3f..5042e870e68 100644
--- a/net-libs/libtorrent/metadata.xml
+++ b/net-libs/libtorrent/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-p2p</herd>
<upstream>
<remote-id type="github">rakshasa/libtorrent</remote-id>
</upstream>
diff --git a/net-libs/libtrace/metadata.xml b/net-libs/libtrace/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-libs/libtrace/metadata.xml
+++ b/net-libs/libtrace/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/libupnp/metadata.xml b/net-libs/libupnp/metadata.xml
index 89b139d370c..2d1885cc8bc 100644
--- a/net-libs/libupnp/metadata.xml
+++ b/net-libs/libupnp/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>maq@maqibooy.com</email>
<name>Marcus Stjärnås</name>
@@ -10,6 +9,10 @@
<email>gurligebis@gentoo.org</email>
<name>Bjarke Istrup Pedersen</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pupnp</remote-id>
</upstream>
diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index c0da6a79ccd..ce4ad39b7fd 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
If you don't know VNC, have a look at the original VNC or at Tridia
VNC, who also have commercial support for it.
diff --git a/net-libs/libwebsockets/metadata.xml b/net-libs/libwebsockets/metadata.xml
index a335db2ebc1..175103e688a 100644
--- a/net-libs/libwebsockets/metadata.xml
+++ b/net-libs/libwebsockets/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>jaco@uls.co.za</email>
<name>Jaco Kroon</name>
<description>Proxy-Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
libwebsockets is a C library designed to make development of websockets clients and servers easier (possible).
</longdescription>
diff --git a/net-libs/libwhisker/metadata.xml b/net-libs/libwhisker/metadata.xml
index 74dec4574fe..ac032672193 100644
--- a/net-libs/libwhisker/metadata.xml
+++ b/net-libs/libwhisker/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>perl</herd>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
<longdescription>
Libwhisker is a Perl library useful for HTTP testing scripts. It
contains a pure-Perl implementation of functionality found in the LWP,
diff --git a/net-libs/libyahoo2/metadata.xml b/net-libs/libyahoo2/metadata.xml
index a4dd39fe7e4..1e21bea6e1f 100644
--- a/net-libs/libyahoo2/metadata.xml
+++ b/net-libs/libyahoo2/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-im</herd>
<upstream>
<remote-id type="sourceforge">libyahoo2</remote-id>
</upstream>
diff --git a/net-libs/libzapojit/metadata.xml b/net-libs/libzapojit/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/libzapojit/metadata.xml
+++ b/net-libs/libzapojit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/loudmouth/metadata.xml b/net-libs/loudmouth/metadata.xml
index fcbfe25fc1f..d1774020e6f 100644
--- a/net-libs/loudmouth/metadata.xml
+++ b/net-libs/loudmouth/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="asyncns">Use libasyncns for asynchronous name resolution.</flag>
</use>
diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml
index f38aad4d9e5..0e1cc0eb847 100644
--- a/net-libs/miniupnpc/metadata.xml
+++ b/net-libs/miniupnpc/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
@@ -10,4 +9,8 @@
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/neon/metadata.xml b/net-libs/neon/metadata.xml
index 25503b43cd0..994779a84e8 100644
--- a/net-libs/neon/metadata.xml
+++ b/net-libs/neon/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>arfrever.fta@gmail.com</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Neon is an HTTP and WebDAV client library for Unix systems, with a C
language API. It provides high-level interfaces to HTTP/1.1 and WebDAV
diff --git a/net-libs/netembryo/metadata.xml b/net-libs/netembryo/metadata.xml
index b55e0e95020..92a08ac3613 100644
--- a/net-libs/netembryo/metadata.xml
+++ b/net-libs/netembryo/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/net-libs/netwib/metadata.xml b/net-libs/netwib/metadata.xml
index f1a97d72142..7dfdb343a7d 100644
--- a/net-libs/netwib/metadata.xml
+++ b/net-libs/netwib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription>Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols</longdescription>
<upstream>
<remote-id type="sourceforge">ntwib</remote-id>
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 850a8eed6aa..38bb00f3c07 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergstroem</name>
</maintainer>
@@ -10,6 +9,10 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="npm">Enable NPM package manager</flag>
<flag name="snapshot">Enable snapshot creation for faster startup</flag>
diff --git a/net-libs/openslp/metadata.xml b/net-libs/openslp/metadata.xml
index 92e1c97fcca..0e748b505ce 100644
--- a/net-libs/openslp/metadata.xml
+++ b/net-libs/openslp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">openslp</remote-id>
</upstream>
diff --git a/net-libs/phodav/metadata.xml b/net-libs/phodav/metadata.xml
index 38087fff4f8..a79fc250511 100644
--- a/net-libs/phodav/metadata.xml
+++ b/net-libs/phodav/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>virtualization</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>virtualization@gentoo.org</email>
+ <name>Gentoo Virtualization Project</name>
+ </maintainer>
<use>
<flag name="spice">Install the spice-webdavd guest agent</flag>
</use>
diff --git a/net-libs/qmf/metadata.xml b/net-libs/qmf/metadata.xml
index 4fd5a5f7ed2..03f11cecfc5 100644
--- a/net-libs/qmf/metadata.xml
+++ b/net-libs/qmf/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>qt</herd>
<maintainer>
<email>pesa@gentoo.org</email>
<name>Davide Pesavento</name>
</maintainer>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/qtweetlib/metadata.xml b/net-libs/qtweetlib/metadata.xml
index e297298a1cd..dfd65612179 100644
--- a/net-libs/qtweetlib/metadata.xml
+++ b/net-libs/qtweetlib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">minimoog/QTweetLib</remote-id>
</upstream>
diff --git a/net-libs/qxmpp/metadata.xml b/net-libs/qxmpp/metadata.xml
index 497e5eb601b..2b82f3349ee 100644
--- a/net-libs/qxmpp/metadata.xml
+++ b/net-libs/qxmpp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>leechcraft</herd>
+<maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+</maintainer>
<upstream>
<bugs-to>https://github.com/qxmpp-project/qxmpp/issues</bugs-to>
<changelog>https://raw.githubusercontent.com/qxmpp-project/qxmpp/master/CHANGELOG</changelog>
diff --git a/net-libs/rb_libtorrent/metadata.xml b/net-libs/rb_libtorrent/metadata.xml
index e3583c47f9b..88d49c835e0 100644
--- a/net-libs/rb_libtorrent/metadata.xml
+++ b/net-libs/rb_libtorrent/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-p2p</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
diff --git a/net-libs/rest/metadata.xml b/net-libs/rest/metadata.xml
index 49d7ac9b6b3..537c6806b89 100644
--- a/net-libs/rest/metadata.xml
+++ b/net-libs/rest/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="gnome">Extract proxy information using
<pkg>net-libs/libsoup-gnome</pkg></flag>
diff --git a/net-libs/ripe-atlas-sagan/metadata.xml b/net-libs/ripe-atlas-sagan/metadata.xml
index 3eba6ff08ad..64bc37c04c5 100644
--- a/net-libs/ripe-atlas-sagan/metadata.xml
+++ b/net-libs/ripe-atlas-sagan/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>gentoo@danielquinn.org</email>
<name>Daniel Quinn</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">ripe.atlas.sagan</remote-id>
</upstream>
diff --git a/net-libs/rpc2/metadata.xml b/net-libs/rpc2/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/net-libs/rpc2/metadata.xml
+++ b/net-libs/rpc2/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/serf/metadata.xml b/net-libs/serf/metadata.xml
index d5a616789e6..033b8f479ce 100644
--- a/net-libs/serf/metadata.xml
+++ b/net-libs/serf/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>arfrever.fta@gmail.com</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">serf</remote-id>
</upstream>
diff --git a/net-libs/signon-oauth2/metadata.xml b/net-libs/signon-oauth2/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/signon-oauth2/metadata.xml
+++ b/net-libs/signon-oauth2/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/signon-ui/metadata.xml b/net-libs/signon-ui/metadata.xml
index 8c7cd30a8a6..f8605af0e58 100644
--- a/net-libs/signon-ui/metadata.xml
+++ b/net-libs/signon-ui/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">signon-ui</remote-id>
</upstream>
diff --git a/net-libs/signond/metadata.xml b/net-libs/signond/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/signond/metadata.xml
+++ b/net-libs/signond/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/socket++/metadata.xml b/net-libs/socket++/metadata.xml
index 54cb0feb074..9f7385532e6 100644
--- a/net-libs/socket++/metadata.xml
+++ b/net-libs/socket++/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cpp</herd>
+ <maintainer>
+ <email>cpp@gentoo.org</email>
+ <name>Gentoo C++ Project</name>
+ </maintainer>
<longdescription>Socket++ library defines a family of C++ classes that can be used more effectively than directly calling the underlying low-level system functions.</longdescription>
</pkgmetadata>
diff --git a/net-libs/socket_wrapper/metadata.xml b/net-libs/socket_wrapper/metadata.xml
index c2d9e83c908..dcbd28056db 100644
--- a/net-libs/socket_wrapper/metadata.xml
+++ b/net-libs/socket_wrapper/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>samba</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+<maintainer>
+ <email>samba@gentoo.org</email>
+ <name>Samba</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/sofia-sip/metadata.xml b/net-libs/sofia-sip/metadata.xml
index 1779ea8f4a2..c13c566a2e1 100644
--- a/net-libs/sofia-sip/metadata.xml
+++ b/net-libs/sofia-sip/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sofia-sip</remote-id>
</upstream>
diff --git a/net-libs/telepathy-accounts-signon/metadata.xml b/net-libs/telepathy-accounts-signon/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/telepathy-accounts-signon/metadata.xml
+++ b/net-libs/telepathy-accounts-signon/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/telepathy-farstream/metadata.xml b/net-libs/telepathy-farstream/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/telepathy-farstream/metadata.xml
+++ b/net-libs/telepathy-farstream/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
index 455620cf3c8..c81875abf34 100644
--- a/net-libs/telepathy-glib/metadata.xml
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
</use>
diff --git a/net-libs/telepathy-logger-qt/metadata.xml b/net-libs/telepathy-logger-qt/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/net-libs/telepathy-logger-qt/metadata.xml
+++ b/net-libs/telepathy-logger-qt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index ee4ec0b5613..d0ad429063a 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="farstream">Enable support for audio/video calls via farstream</flag>
</use>
diff --git a/net-libs/uhttpmock/metadata.xml b/net-libs/uhttpmock/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-libs/uhttpmock/metadata.xml
+++ b/net-libs/uhttpmock/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index f3d154bebd7..513688b3376 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="coverage">Enable code coverage support</flag>
<flag name="egl">Enable EGL support.</flag>
diff --git a/net-libs/wvstreams/metadata.xml b/net-libs/wvstreams/metadata.xml
index 4fd26ae6812..7c0e71ec22c 100644
--- a/net-libs/wvstreams/metadata.xml
+++ b/net-libs/wvstreams/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>net-dialup</herd>
<upstream>
<remote-id type="google-code">wvstreams</remote-id>
</upstream>
diff --git a/net-libs/xrootd/metadata.xml b/net-libs/xrootd/metadata.xml
index 4d4eef0ef40..e93168f4a7d 100644
--- a/net-libs/xrootd/metadata.xml
+++ b/net-libs/xrootd/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci-physics</herd>
+ <maintainer>
+ <email>sci-physics@gentoo.org</email>
+ <name>Gentoo Physics Project</name>
+ </maintainer>
<longdescription lang="en">
XROOTD software framework is a fully generic suite for fast, low latency
and scalable data access, which can serve natively any kind of data,