summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/aimsniff/metadata.xml5
-rw-r--r--net-analyzer/alive/metadata.xml5
-rw-r--r--net-analyzer/amap/metadata.xml5
-rw-r--r--net-analyzer/angst/metadata.xml5
-rw-r--r--net-analyzer/apinger/metadata.xml5
-rw-r--r--net-analyzer/argus-clients/metadata.xml5
-rw-r--r--net-analyzer/argus/metadata.xml5
-rw-r--r--net-analyzer/arp-scan/metadata.xml5
-rw-r--r--net-analyzer/arp-sk/metadata.xml5
-rw-r--r--net-analyzer/arping/metadata.xml5
-rw-r--r--net-analyzer/arpoison/metadata.xml5
-rw-r--r--net-analyzer/arptools/metadata.xml5
-rw-r--r--net-analyzer/arpwatch/metadata.xml5
-rw-r--r--net-analyzer/barnyard/metadata.xml5
-rw-r--r--net-analyzer/barnyard2/metadata.xml10
-rw-r--r--net-analyzer/bigeye/metadata.xml5
-rw-r--r--net-analyzer/bmon/metadata.xml5
-rw-r--r--net-analyzer/braa/metadata.xml5
-rw-r--r--net-analyzer/bsnmp/metadata.xml5
-rw-r--r--net-analyzer/bwbar/metadata.xml5
-rw-r--r--net-analyzer/bwmon/metadata.xml5
-rw-r--r--net-analyzer/bwping/metadata.xml5
-rw-r--r--net-analyzer/cacti-spine/metadata.xml5
-rw-r--r--net-analyzer/cacti/metadata.xml5
-rw-r--r--net-analyzer/calamaris/metadata.xml5
-rw-r--r--net-analyzer/carl/metadata.xml5
-rw-r--r--net-analyzer/cbm/metadata.xml5
-rw-r--r--net-analyzer/chaosreader/metadata.xml5
-rw-r--r--net-analyzer/check_mk/metadata.xml5
-rw-r--r--net-analyzer/cnet/metadata.xml5
-rw-r--r--net-analyzer/cryptcat/metadata.xml5
-rw-r--r--net-analyzer/cutter/metadata.xml5
-rw-r--r--net-analyzer/darkstat/metadata.xml5
-rw-r--r--net-analyzer/dhcp_probe/metadata.xml5
-rw-r--r--net-analyzer/dhcpdump/metadata.xml5
-rw-r--r--net-analyzer/dnstracer/metadata.xml5
-rw-r--r--net-analyzer/dosdetector/metadata.xml5
-rw-r--r--net-analyzer/driftnet/metadata.xml5
-rw-r--r--net-analyzer/dsniff/metadata.xml5
-rw-r--r--net-analyzer/echoping/metadata.xml5
-rw-r--r--net-analyzer/egressor/metadata.xml5
-rw-r--r--net-analyzer/etherape/metadata.xml5
-rw-r--r--net-analyzer/ethloop/metadata.xml5
-rw-r--r--net-analyzer/ettercap/metadata.xml5
-rw-r--r--net-analyzer/fail2ban/metadata.xml5
-rw-r--r--net-analyzer/fe3d/metadata.xml5
-rw-r--r--net-analyzer/ffp/metadata.xml5
-rw-r--r--net-analyzer/firewalk/metadata.xml5
-rw-r--r--net-analyzer/flow-tools/metadata.xml5
-rw-r--r--net-analyzer/flowgrind/metadata.xml5
-rw-r--r--net-analyzer/fping/metadata.xml5
-rw-r--r--net-analyzer/fprobe/metadata.xml5
-rw-r--r--net-analyzer/fragroute/metadata.xml5
-rw-r--r--net-analyzer/ftester/metadata.xml5
-rw-r--r--net-analyzer/fwlogwatch/metadata.xml5
-rw-r--r--net-analyzer/gensink/metadata.xml5
-rw-r--r--net-analyzer/gnome-nettool/metadata.xml5
-rw-r--r--net-analyzer/gnu-netcat/metadata.xml5
-rw-r--r--net-analyzer/goaccess/metadata.xml5
-rw-r--r--net-analyzer/gr-fosphor/metadata.xml5
-rw-r--r--net-analyzer/gsm-receiver/metadata.xml5
-rw-r--r--net-analyzer/hping/metadata.xml5
-rw-r--r--net-analyzer/httping/metadata.xml5
-rw-r--r--net-analyzer/hunt/metadata.xml5
-rw-r--r--net-analyzer/hydra/metadata.xml5
-rw-r--r--net-analyzer/ibmonitor/metadata.xml5
-rw-r--r--net-analyzer/ifmetric/metadata.xml5
-rw-r--r--net-analyzer/ifstat/metadata.xml5
-rw-r--r--net-analyzer/ifstatus/metadata.xml5
-rw-r--r--net-analyzer/iftop/metadata.xml5
-rw-r--r--net-analyzer/ike-scan/metadata.xml5
-rw-r--r--net-analyzer/ipband/metadata.xml5
-rw-r--r--net-analyzer/ipcad/metadata.xml5
-rw-r--r--net-analyzer/ipgen/metadata.xml5
-rw-r--r--net-analyzer/ipguard/metadata.xml5
-rw-r--r--net-analyzer/iplog/metadata.xml5
-rw-r--r--net-analyzer/ippl/metadata.xml5
-rw-r--r--net-analyzer/iptraf-ng/metadata.xml5
-rw-r--r--net-analyzer/iptstate/metadata.xml5
-rw-r--r--net-analyzer/isic/metadata.xml5
-rw-r--r--net-analyzer/jffnms/metadata.xml5
-rw-r--r--net-analyzer/jmx2munin/metadata.xml10
-rw-r--r--net-analyzer/jnettop/metadata.xml5
-rw-r--r--net-analyzer/knocker/metadata.xml5
-rw-r--r--net-analyzer/labrea/metadata.xml5
-rw-r--r--net-analyzer/lft/metadata.xml5
-rw-r--r--net-analyzer/libnasl/metadata.xml5
-rw-r--r--net-analyzer/lilac/metadata.xml5
-rw-r--r--net-analyzer/macchanger/metadata.xml5
-rw-r--r--net-analyzer/masscan/metadata.xml5
-rw-r--r--net-analyzer/mate-netspeed/metadata.xml5
-rw-r--r--net-analyzer/mbrowse/metadata.xml5
-rw-r--r--net-analyzer/monitoring-plugins/metadata.xml5
-rw-r--r--net-analyzer/mping/metadata.xml5
-rw-r--r--net-analyzer/mrtg-ping-probe/metadata.xml5
-rw-r--r--net-analyzer/mrtg/metadata.xml5
-rw-r--r--net-analyzer/mtr/metadata.xml5
-rw-r--r--net-analyzer/multimon-ng/metadata.xml5
-rw-r--r--net-analyzer/munin/metadata.xml5
-rw-r--r--net-analyzer/nagios-check_dnssec/metadata.xml12
-rw-r--r--net-analyzer/nagios-check_fail2ban/metadata.xml5
-rw-r--r--net-analyzer/nagios-check_glsa2/metadata.xml10
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/metadata.xml12
-rw-r--r--net-analyzer/nagios-check_logfiles/metadata.xml12
-rw-r--r--net-analyzer/nagios-check_mysql_health/metadata.xml6
-rw-r--r--net-analyzer/nagios-check_pidfile/metadata.xml5
-rw-r--r--net-analyzer/nagios-check_rbl/metadata.xml12
-rw-r--r--net-analyzer/nagios-core/metadata.xml10
-rw-r--r--net-analyzer/nagios-plugins-flameeyes/metadata.xml5
-rw-r--r--net-analyzer/nagios-plugins-snmp/metadata.xml12
-rw-r--r--net-analyzer/nagios-plugins/metadata.xml10
-rw-r--r--net-analyzer/nagios-sap-ccms-plugin/metadata.xml10
-rw-r--r--net-analyzer/nagios/metadata.xml10
-rw-r--r--net-analyzer/nagircbot/metadata.xml5
-rw-r--r--net-analyzer/nagstamon/metadata.xml5
-rw-r--r--net-analyzer/namebench/metadata.xml5
-rw-r--r--net-analyzer/nast/metadata.xml5
-rw-r--r--net-analyzer/nbtscan/metadata.xml5
-rw-r--r--net-analyzer/nbwmon/metadata.xml5
-rw-r--r--net-analyzer/ndoutils/metadata.xml5
-rw-r--r--net-analyzer/ndsad/metadata.xml5
-rw-r--r--net-analyzer/nepenthes/metadata.xml5
-rw-r--r--net-analyzer/nessus-bin/metadata.xml5
-rw-r--r--net-analyzer/nessus-client/metadata.xml5
-rw-r--r--net-analyzer/nessus-core/metadata.xml5
-rw-r--r--net-analyzer/nessus-libraries/metadata.xml5
-rw-r--r--net-analyzer/nessus-plugins/metadata.xml5
-rw-r--r--net-analyzer/nessus/metadata.xml5
-rw-r--r--net-analyzer/net-snmp/metadata.xml5
-rw-r--r--net-analyzer/netcat/metadata.xml5
-rw-r--r--net-analyzer/netcat6/metadata.xml5
-rw-r--r--net-analyzer/netdiscover/metadata.xml5
-rw-r--r--net-analyzer/nethogs/metadata.xml5
-rw-r--r--net-analyzer/neti/metadata.xml5
-rw-r--r--net-analyzer/netio/metadata.xml5
-rw-r--r--net-analyzer/netperf/metadata.xml5
-rw-r--r--net-analyzer/netselect/metadata.xml5
-rw-r--r--net-analyzer/nettop/metadata.xml5
-rw-r--r--net-analyzer/netwag/metadata.xml5
-rw-r--r--net-analyzer/netwatch/metadata.xml5
-rw-r--r--net-analyzer/netwox/metadata.xml5
-rw-r--r--net-analyzer/nfdump/metadata.xml5
-rw-r--r--net-analyzer/ngrep/metadata.xml10
-rw-r--r--net-analyzer/nload/metadata.xml5
-rw-r--r--net-analyzer/nmap/metadata.xml5
-rw-r--r--net-analyzer/nmapsi/metadata.xml5
-rw-r--r--net-analyzer/nodebrain/metadata.xml5
-rw-r--r--net-analyzer/nrpe/metadata.xml5
-rw-r--r--net-analyzer/nsat/metadata.xml5
-rw-r--r--net-analyzer/nsca/metadata.xml5
-rw-r--r--net-analyzer/nstats/metadata.xml5
-rw-r--r--net-analyzer/ntop/metadata.xml5
-rw-r--r--net-analyzer/nttcp/metadata.xml5
-rw-r--r--net-analyzer/odhcploc/metadata.xml5
-rw-r--r--net-analyzer/oinkmaster/metadata.xml5
-rw-r--r--net-analyzer/p0f/metadata.xml5
-rw-r--r--net-analyzer/packit/metadata.xml5
-rw-r--r--net-analyzer/pathload/metadata.xml5
-rw-r--r--net-analyzer/pbnj/metadata.xml10
-rw-r--r--net-analyzer/pinger/metadata.xml5
-rw-r--r--net-analyzer/pktstat/metadata.xml5
-rw-r--r--net-analyzer/pmacct/metadata.xml5
-rw-r--r--net-analyzer/pnp4nagios/metadata.xml5
-rw-r--r--net-analyzer/portmon/metadata.xml5
-rw-r--r--net-analyzer/portsentry/metadata.xml5
-rw-r--r--net-analyzer/postal/metadata.xml5
-rw-r--r--net-analyzer/pypacker/metadata.xml5
-rw-r--r--net-analyzer/quidscor/metadata.xml5
-rw-r--r--net-analyzer/rain/metadata.xml5
-rw-r--r--net-analyzer/ripe-atlas-tools/metadata.xml5
-rw-r--r--net-analyzer/rrdcollect/metadata.xml5
-rw-r--r--net-analyzer/rrdtool/metadata.xml5
-rw-r--r--net-analyzer/sancp/metadata.xml5
-rw-r--r--net-analyzer/sarg/metadata.xml5
-rw-r--r--net-analyzer/sbd/metadata.xml5
-rw-r--r--net-analyzer/scanlogd/metadata.xml5
-rw-r--r--net-analyzer/scanssh/metadata.xml5
-rw-r--r--net-analyzer/scapy/metadata.xml5
-rw-r--r--net-analyzer/scli/metadata.xml5
-rw-r--r--net-analyzer/sec/metadata.xml5
-rw-r--r--net-analyzer/sflowtool/metadata.xml5
-rw-r--r--net-analyzer/sguil-client/metadata.xml5
-rw-r--r--net-analyzer/sguil-sensor/metadata.xml5
-rw-r--r--net-analyzer/sguil-server/metadata.xml5
-rw-r--r--net-analyzer/sinfo/metadata.xml5
-rw-r--r--net-analyzer/siphon/metadata.xml5
-rw-r--r--net-analyzer/slurm/metadata.xml5
-rw-r--r--net-analyzer/smokeping/metadata.xml5
-rw-r--r--net-analyzer/sniffit/metadata.xml5
-rw-r--r--net-analyzer/snmptt/metadata.xml5
-rw-r--r--net-analyzer/snort/metadata.xml10
-rw-r--r--net-analyzer/snortalog/metadata.xml5
-rw-r--r--net-analyzer/snortsam/metadata.xml5
-rw-r--r--net-analyzer/softflowd/metadata.xml5
-rw-r--r--net-analyzer/sqlninja/metadata.xml5
-rw-r--r--net-analyzer/squid-graph/metadata.xml5
-rw-r--r--net-analyzer/squidsites/metadata.xml5
-rw-r--r--net-analyzer/ssldump/metadata.xml5
-rw-r--r--net-analyzer/ssmping/metadata.xml10
-rw-r--r--net-analyzer/symon/metadata.xml5
-rw-r--r--net-analyzer/syweb/metadata.xml5
-rw-r--r--net-analyzer/tcpdump/metadata.xml5
-rw-r--r--net-analyzer/tcpflow/metadata.xml5
-rw-r--r--net-analyzer/tcpreen/metadata.xml5
-rw-r--r--net-analyzer/tcpreplay/metadata.xml5
-rw-r--r--net-analyzer/tcpslice/metadata.xml5
-rw-r--r--net-analyzer/tcpstat/metadata.xml5
-rw-r--r--net-analyzer/tcptrace/metadata.xml5
-rw-r--r--net-analyzer/tcptraceroute/metadata.xml5
-rw-r--r--net-analyzer/tcptrack/metadata.xml5
-rw-r--r--net-analyzer/thcrut/metadata.xml5
-rw-r--r--net-analyzer/tleds/metadata.xml5
-rw-r--r--net-analyzer/tptest/metadata.xml5
-rw-r--r--net-analyzer/tracebox/metadata.xml5
-rw-r--r--net-analyzer/traceproto/metadata.xml5
-rw-r--r--net-analyzer/traceroute-nanog/metadata.xml5
-rw-r--r--net-analyzer/traceroute/metadata.xml5
-rw-r--r--net-analyzer/trafshow/metadata.xml5
-rw-r--r--net-analyzer/ttcp/metadata.xml5
-rw-r--r--net-analyzer/upnpscan/metadata.xml5
-rw-r--r--net-analyzer/vnstat/metadata.xml5
-rw-r--r--net-analyzer/w3af/metadata.xml5
-rw-r--r--net-analyzer/webfuzzer/metadata.xml5
-rw-r--r--net-analyzer/wireshark/metadata.xml5
-rw-r--r--net-analyzer/xnetload/metadata.xml5
-rw-r--r--net-analyzer/xprobe/metadata.xml5
-rw-r--r--net-analyzer/yersinia/metadata.xml5
-rw-r--r--net-analyzer/zniper/metadata.xml5
228 files changed, 981 insertions, 250 deletions
diff --git a/net-analyzer/aimsniff/metadata.xml b/net-analyzer/aimsniff/metadata.xml
index b17448781b4..6ecac3c88f2 100644
--- a/net-analyzer/aimsniff/metadata.xml
+++ b/net-analyzer/aimsniff/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>aimsniff is a utility used for retrieving and storing AIM messages across a network.</longdescription>
<use>
<flag name="http">Install the WAS (Web AIM Sniff) frontend</flag>
diff --git a/net-analyzer/alive/metadata.xml b/net-analyzer/alive/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/alive/metadata.xml
+++ b/net-analyzer/alive/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-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/amap/metadata.xml
+++ b/net-analyzer/amap/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-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
index 7c9939792b8..4d52271d50b 100644
--- a/net-analyzer/angst/metadata.xml
+++ b/net-analyzer/angst/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>an active sniffer that provides methods for aggressive sniffing on switched LAN</longdescription>
<upstream>
<remote-id type="sourceforge">angst</remote-id>
diff --git a/net-analyzer/apinger/metadata.xml b/net-analyzer/apinger/metadata.xml
index 37a3ce04f3b..bc5a7dacba3 100644
--- a/net-analyzer/apinger/metadata.xml
+++ b/net-analyzer/apinger/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="github">Jajcus/apinger</remote-id>
</upstream>
diff --git a/net-analyzer/argus-clients/metadata.xml b/net-analyzer/argus-clients/metadata.xml
index ca640803f2e..6930324adf2 100644
--- a/net-analyzer/argus-clients/metadata.xml
+++ b/net-analyzer/argus-clients/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="ft">Enable support for flow packets through
<pkg>net-analyzer/flow-tools</pkg></flag></use>
</pkgmetadata>
diff --git a/net-analyzer/argus/metadata.xml b/net-analyzer/argus/metadata.xml
index a688da31125..85e6454fc98 100644
--- a/net-analyzer/argus/metadata.xml
+++ b/net-analyzer/argus/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>network Audit Record Generation and Utilization System</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/arp-scan/metadata.xml b/net-analyzer/arp-scan/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/arp-scan/metadata.xml
+++ b/net-analyzer/arp-scan/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-analyzer/arp-sk/metadata.xml b/net-analyzer/arp-sk/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/arp-sk/metadata.xml
+++ b/net-analyzer/arp-sk/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-analyzer/arping/metadata.xml b/net-analyzer/arping/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/arping/metadata.xml
+++ b/net-analyzer/arping/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-analyzer/arpoison/metadata.xml b/net-analyzer/arpoison/metadata.xml
index 0ed24829a4e..9267a85dbe7 100644
--- a/net-analyzer/arpoison/metadata.xml
+++ b/net-analyzer/arpoison/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">arpoison</remote-id>
</upstream>
diff --git a/net-analyzer/arptools/metadata.xml b/net-analyzer/arptools/metadata.xml
index 02380372391..1e385042d0b 100644
--- a/net-analyzer/arptools/metadata.xml
+++ b/net-analyzer/arptools/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml
index 4fc697499bf..a01564b4c12 100644
--- a/net-analyzer/arpwatch/metadata.xml
+++ b/net-analyzer/arpwatch/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">
The arpwatch package contains arpwatch and arpsnmp. Arpwatch and arpsnmp
are both network monitoring tools. Both utilities monitor Ethernet or
diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml
index c2407e4f202..f0304f765f7 100644
--- a/net-analyzer/barnyard/metadata.xml
+++ b/net-analyzer/barnyard/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>Fast output system for Snort</longdescription>
<use>
<flag name="sguil">Enable sguil (The Analyst Console for Network Security
diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
index 4c392ce3048..0d74a83e588 100644
--- a/net-analyzer/barnyard2/metadata.xml
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
@@ -13,6 +11,14 @@
<name>Jason Wallace</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Barnyard2 is a fork of the original barnyard project (which is no longer under development).
Barnyard2 is an open source interpreter for Snort unified2 binary output files. Its primary
diff --git a/net-analyzer/bigeye/metadata.xml b/net-analyzer/bigeye/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/bigeye/metadata.xml
+++ b/net-analyzer/bigeye/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-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml
index 690ee39c881..7f1160f2b59 100644
--- a/net-analyzer/bmon/metadata.xml
+++ b/net-analyzer/bmon/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="github">tgraf/bmon</remote-id>
</upstream>
diff --git a/net-analyzer/braa/metadata.xml b/net-analyzer/braa/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-analyzer/braa/metadata.xml
+++ b/net-analyzer/braa/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-analyzer/bsnmp/metadata.xml b/net-analyzer/bsnmp/metadata.xml
index ecedda4aa2c..d7caf7d3b1d 100644
--- a/net-analyzer/bsnmp/metadata.xml
+++ b/net-analyzer/bsnmp/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>bsd</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/bwbar/metadata.xml b/net-analyzer/bwbar/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/bwbar/metadata.xml
+++ b/net-analyzer/bwbar/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-analyzer/bwmon/metadata.xml b/net-analyzer/bwmon/metadata.xml
index 27806ec6db3..55d84dd75c5 100644
--- a/net-analyzer/bwmon/metadata.xml
+++ b/net-analyzer/bwmon/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>Simple ncurses bandwidth monitor</longdescription>
<upstream>
<remote-id type="sourceforge">bwmon</remote-id>
diff --git a/net-analyzer/bwping/metadata.xml b/net-analyzer/bwping/metadata.xml
index 905c8f0a532..fc60ad92bd8 100644
--- a/net-analyzer/bwping/metadata.xml
+++ b/net-analyzer/bwping/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>netmon</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<maintainer>
<email>oleg.derevenetz@gmail.com</email>
diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
index 10fe1e4fab5..a98a420d5e4 100644
--- a/net-analyzer/cacti-spine/metadata.xml
+++ b/net-analyzer/cacti-spine/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">
Spine (formerly known as Cactid) is a poller for Cacti that primarily
strives to be as fast as possible. For this reason it is written in
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index e678dff1c40..a5a3ebe1556 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/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">
Cacti is a complete network graphing solution designed to harness the
power of RRDTool's data storage and graphing functionality. Cacti
diff --git a/net-analyzer/calamaris/metadata.xml b/net-analyzer/calamaris/metadata.xml
index e0a1efa4d10..674a277af9f 100644
--- a/net-analyzer/calamaris/metadata.xml
+++ b/net-analyzer/calamaris/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/carl/metadata.xml b/net-analyzer/carl/metadata.xml
index adf1f1463df..dd5e51579c6 100644
--- a/net-analyzer/carl/metadata.xml
+++ b/net-analyzer/carl/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>netmon</herd>
<maintainer>
<email>klausman@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/cbm/metadata.xml b/net-analyzer/cbm/metadata.xml
index 7b47a3a9c4a..89ce46a9345 100644
--- a/net-analyzer/cbm/metadata.xml
+++ b/net-analyzer/cbm/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>netmon</herd>
<maintainer>
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
index 98ec2543b2c..1977731933a 100644
--- a/net-analyzer/chaosreader/metadata.xml
+++ b/net-analyzer/chaosreader/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>rainbow@irh.it</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">chaosreader</remote-id>
</upstream>
diff --git a/net-analyzer/check_mk/metadata.xml b/net-analyzer/check_mk/metadata.xml
index 459b3c54246..43b0003a144 100644
--- a/net-analyzer/check_mk/metadata.xml
+++ b/net-analyzer/check_mk/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>morlix@morlix.de</email>
<name>Timo Eissler</name>
<description>maintainer, assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
General purpose Nagios/Icinga plugin for retrieving data.
Check_MK is a collection of extensions for the IT-Monitoring-Kernel of Nagios/Icinga
diff --git a/net-analyzer/cnet/metadata.xml b/net-analyzer/cnet/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/cnet/metadata.xml
+++ b/net-analyzer/cnet/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-analyzer/cryptcat/metadata.xml b/net-analyzer/cryptcat/metadata.xml
index 5313eaf94f3..7b106ad1255 100644
--- a/net-analyzer/cryptcat/metadata.xml
+++ b/net-analyzer/cryptcat/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">cryptcat</remote-id>
</upstream>
diff --git a/net-analyzer/cutter/metadata.xml b/net-analyzer/cutter/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/cutter/metadata.xml
+++ b/net-analyzer/cutter/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-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
index ef4d76a6dd9..5dbeab2f550 100644
--- a/net-analyzer/darkstat/metadata.xml
+++ b/net-analyzer/darkstat/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">
darkstat is a network statistics gatherer. It's a packet sniffer that
runs as a background process on a cable/DSL router, gathers all sorts of
diff --git a/net-analyzer/dhcp_probe/metadata.xml b/net-analyzer/dhcp_probe/metadata.xml
index bfc69c95fdf..7be50d0888b 100644
--- a/net-analyzer/dhcp_probe/metadata.xml
+++ b/net-analyzer/dhcp_probe/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>netmon</herd>
<maintainer>
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription>
dchp_probe attempts to discover DHCP and BootP servers on a
directly-attached Ethernet network
diff --git a/net-analyzer/dhcpdump/metadata.xml b/net-analyzer/dhcpdump/metadata.xml
index 6eaa764e301..d7239c52456 100644
--- a/net-analyzer/dhcpdump/metadata.xml
+++ b/net-analyzer/dhcpdump/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>
This command parses the output of tcpdump to display the
dhcp-packets for easier checking and debugging.
diff --git a/net-analyzer/dnstracer/metadata.xml b/net-analyzer/dnstracer/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/dnstracer/metadata.xml
+++ b/net-analyzer/dnstracer/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-analyzer/dosdetector/metadata.xml b/net-analyzer/dosdetector/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/dosdetector/metadata.xml
+++ b/net-analyzer/dosdetector/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-analyzer/driftnet/metadata.xml b/net-analyzer/driftnet/metadata.xml
index 6c3eac426b2..4d5ec8627f3 100644
--- a/net-analyzer/driftnet/metadata.xml
+++ b/net-analyzer/driftnet/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>A program which listens to network traffic and picks out images from TCP streams it observes</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/dsniff/metadata.xml b/net-analyzer/dsniff/metadata.xml
index 813da7f880a..436d0d22684 100644
--- a/net-analyzer/dsniff/metadata.xml
+++ b/net-analyzer/dsniff/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>
dsniff is a collection of tools for network auditing and penetration testing.
dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a
diff --git a/net-analyzer/echoping/metadata.xml b/net-analyzer/echoping/metadata.xml
index 59f505d0a95..142ab5a3144 100644
--- a/net-analyzer/echoping/metadata.xml
+++ b/net-analyzer/echoping/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="http">enable support for http protocol.</flag>
<flag name="icp">enable support for ICP (used to monitor proxies).</flag>
diff --git a/net-analyzer/egressor/metadata.xml b/net-analyzer/egressor/metadata.xml
index b54ba29ed2d..95b9242ab02 100644
--- a/net-analyzer/egressor/metadata.xml
+++ b/net-analyzer/egressor/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>tool for checking router configuration</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/etherape/metadata.xml b/net-analyzer/etherape/metadata.xml
index ff3468df581..b9d123db53d 100644
--- a/net-analyzer/etherape/metadata.xml
+++ b/net-analyzer/etherape/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">
EtherApe is a graphical network monitor for Unix modeled after etherman.
Featuring link layer, ip and TCP modes, it displays network activity
diff --git a/net-analyzer/ethloop/metadata.xml b/net-analyzer/ethloop/metadata.xml
index 3f03418f6fe..2dc4fcb1022 100644
--- a/net-analyzer/ethloop/metadata.xml
+++ b/net-analyzer/ethloop/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>Local simulator for testing Linux QoS disciplines</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml
index 6b2a946bb7f..af192ee45b2 100644
--- a/net-analyzer/ettercap/metadata.xml
+++ b/net-analyzer/ettercap/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>netmon</herd>
<maintainer>
<email>zerochaos@gentoo.org</email>
<name>Rick Farina</name>
@@ -10,6 +9,10 @@
<email>ago@gentoo.org</email>
<name>Agostino Sarubbo</name>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<use>
<flag name="plugins">Install ettercap plugins (et_*.so)</flag>
</use>
diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index c978e6a21a4..6f5ffffeae1 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/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="github">fail2ban/fail2ban</remote-id>
</upstream>
diff --git a/net-analyzer/fe3d/metadata.xml b/net-analyzer/fe3d/metadata.xml
index 5fd4d3b4225..7c166025032 100644
--- a/net-analyzer/fe3d/metadata.xml
+++ b/net-analyzer/fe3d/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">fe3d</remote-id>
</upstream>
diff --git a/net-analyzer/ffp/metadata.xml b/net-analyzer/ffp/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/ffp/metadata.xml
+++ b/net-analyzer/ffp/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-analyzer/firewalk/metadata.xml b/net-analyzer/firewalk/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/firewalk/metadata.xml
+++ b/net-analyzer/firewalk/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-analyzer/flow-tools/metadata.xml b/net-analyzer/flow-tools/metadata.xml
index 2ba3ac52530..4f0bbb1755b 100644
--- a/net-analyzer/flow-tools/metadata.xml
+++ b/net-analyzer/flow-tools/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">Flow-tools is library and a collection of programs used to collect,
send, process, and generate reports from NetFlow data. The tools can be
used together on a single server or distributed to multiple servers for
diff --git a/net-analyzer/flowgrind/metadata.xml b/net-analyzer/flowgrind/metadata.xml
index a26ecbdd77e..15e6b5939ff 100644
--- a/net-analyzer/flowgrind/metadata.xml
+++ b/net-analyzer/flowgrind/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="pcap">Enable packet capturing support using <pkg>net-libs/libpcap</pkg></flag>
</use>
diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml
index c9544434423..3ca54aca499 100644
--- a/net-analyzer/fping/metadata.xml
+++ b/net-analyzer/fping/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>A utility to ping multiple hosts at once</longdescription>
<upstream>
<remote-id type="sourceforge">fping</remote-id>
diff --git a/net-analyzer/fprobe/metadata.xml b/net-analyzer/fprobe/metadata.xml
index 8cbeac76773..5f056ee61ba 100644
--- a/net-analyzer/fprobe/metadata.xml
+++ b/net-analyzer/fprobe/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="messages">enable console messages</flag>
</use>
diff --git a/net-analyzer/fragroute/metadata.xml b/net-analyzer/fragroute/metadata.xml
index 9c9de543b91..1cc1b5529e7 100644
--- a/net-analyzer/fragroute/metadata.xml
+++ b/net-analyzer/fragroute/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="github">stsi/fragroute-ipv6</remote-id>
</upstream>
diff --git a/net-analyzer/ftester/metadata.xml b/net-analyzer/ftester/metadata.xml
index e88d7a7ee81..85aeafd7989 100644
--- a/net-analyzer/ftester/metadata.xml
+++ b/net-analyzer/ftester/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>
Ftester - Firewall and Intrusion Detection System testing tool
</longdescription>
diff --git a/net-analyzer/fwlogwatch/metadata.xml b/net-analyzer/fwlogwatch/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/fwlogwatch/metadata.xml
+++ b/net-analyzer/fwlogwatch/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-analyzer/gensink/metadata.xml b/net-analyzer/gensink/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/gensink/metadata.xml
+++ b/net-analyzer/gensink/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-analyzer/gnome-nettool/metadata.xml b/net-analyzer/gnome-nettool/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/net-analyzer/gnome-nettool/metadata.xml
+++ b/net-analyzer/gnome-nettool/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-analyzer/gnu-netcat/metadata.xml b/net-analyzer/gnu-netcat/metadata.xml
index 6c3bd911c6b..e02b1b613be 100644
--- a/net-analyzer/gnu-netcat/metadata.xml
+++ b/net-analyzer/gnu-netcat/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>the GNU network swiss army knife</longdescription>
<upstream>
<remote-id type="sourceforge">netcat</remote-id>
diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index d11be925d37..093bbebf262 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/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>spiderx@spiderx.dp.ua</email>
<name>Vladimir Pavljuchenkov</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>GoAccess is an open source real-time web log analyzer and
interactive viewer that runs in a terminal in *nix systems. It provides fast and valuable
HTTP statistics for system administrators that require a visual server report on the fly.
diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml
index f72d3dc7553..0495a237553 100644
--- a/net-analyzer/gr-fosphor/metadata.xml
+++ b/net-analyzer/gr-fosphor/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="glfw">enable GLFW based interface</flag>
</use>
diff --git a/net-analyzer/gsm-receiver/metadata.xml b/net-analyzer/gsm-receiver/metadata.xml
index 19e2deffdc9..370d4d1560c 100644
--- a/net-analyzer/gsm-receiver/metadata.xml
+++ b/net-analyzer/gsm-receiver/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-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/hping/metadata.xml
+++ b/net-analyzer/hping/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-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml
index 286e8d9dbc8..360668e9079 100644
--- a/net-analyzer/httping/metadata.xml
+++ b/net-analyzer/httping/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="tfo">Enable support for TCP Fast Open</flag>
</use>
diff --git a/net-analyzer/hunt/metadata.xml b/net-analyzer/hunt/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/hunt/metadata.xml
+++ b/net-analyzer/hunt/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-analyzer/hydra/metadata.xml b/net-analyzer/hydra/metadata.xml
index 022063110f4..05d2ef7b702 100644
--- a/net-analyzer/hydra/metadata.xml
+++ b/net-analyzer/hydra/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>Advanced parallized login hacker</longdescription>
<use><flag name="ncp">NCP protocol (NetWare) support through <pkg>net-fs/ncpfs</pkg></flag></use>
</pkgmetadata>
diff --git a/net-analyzer/ibmonitor/metadata.xml b/net-analyzer/ibmonitor/metadata.xml
index 516ff1ada98..96bd348166e 100644
--- a/net-analyzer/ibmonitor/metadata.xml
+++ b/net-analyzer/ibmonitor/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">ibmonitor</remote-id>
</upstream>
diff --git a/net-analyzer/ifmetric/metadata.xml b/net-analyzer/ifmetric/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-analyzer/ifmetric/metadata.xml
+++ b/net-analyzer/ifmetric/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-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml
index 73fc3f8a186..259f96bc0d8 100644
--- a/net-analyzer/ifstat/metadata.xml
+++ b/net-analyzer/ifstat/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>netmon</herd>
<maintainer>
<email>jer@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription>
ifstat is a utility to monitor network interface bandwidth usage, with
vmstat look and feel.
diff --git a/net-analyzer/ifstatus/metadata.xml b/net-analyzer/ifstatus/metadata.xml
index 0bda9893d46..804011732b2 100644
--- a/net-analyzer/ifstatus/metadata.xml
+++ b/net-analyzer/ifstatus/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">ifstatus</remote-id>
</upstream>
diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml
index 43ff7546736..fcdeee5abcc 100644
--- a/net-analyzer/iftop/metadata.xml
+++ b/net-analyzer/iftop/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-analyzer/ike-scan/metadata.xml b/net-analyzer/ike-scan/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-analyzer/ike-scan/metadata.xml
+++ b/net-analyzer/ike-scan/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-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml
index 99a09197b3d..7bb54236cee 100644
--- a/net-analyzer/ipband/metadata.xml
+++ b/net-analyzer/ipband/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">ipband</remote-id>
</upstream>
diff --git a/net-analyzer/ipcad/metadata.xml b/net-analyzer/ipcad/metadata.xml
index a40109394b5..7be0944d537 100644
--- a/net-analyzer/ipcad/metadata.xml
+++ b/net-analyzer/ipcad/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>IP Cisco Accounting Daemon</longdescription>
<upstream>
<remote-id type="sourceforge">ipcad</remote-id>
diff --git a/net-analyzer/ipgen/metadata.xml b/net-analyzer/ipgen/metadata.xml
index 3357a179644..a03488061bf 100644
--- a/net-analyzer/ipgen/metadata.xml
+++ b/net-analyzer/ipgen/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="github">royhills/ipgen</remote-id>
</upstream>
diff --git a/net-analyzer/ipguard/metadata.xml b/net-analyzer/ipguard/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/ipguard/metadata.xml
+++ b/net-analyzer/ipguard/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-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml
index 29e17cd9305..b020e0c8d25 100644
--- a/net-analyzer/iplog/metadata.xml
+++ b/net-analyzer/iplog/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>iplog is a TCP/IP traffic logger</longdescription>
<upstream>
<remote-id type="sourceforge">ojnk</remote-id>
diff --git a/net-analyzer/ippl/metadata.xml b/net-analyzer/ippl/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/ippl/metadata.xml
+++ b/net-analyzer/ippl/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-analyzer/iptraf-ng/metadata.xml b/net-analyzer/iptraf-ng/metadata.xml
index 1599ce69cc6..d59ac170f96 100644
--- a/net-analyzer/iptraf-ng/metadata.xml
+++ b/net-analyzer/iptraf-ng/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>
Interactive Colorful IP LAN Monitor, an active fork of iptraf
</longdescription>
diff --git a/net-analyzer/iptstate/metadata.xml b/net-analyzer/iptstate/metadata.xml
index facd2fdc208..462ab8ac514 100644
--- a/net-analyzer/iptstate/metadata.xml
+++ b/net-analyzer/iptstate/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>IP Tables State displays states being kept by iptables in a top-like format</longdescription>
<upstream>
<remote-id type="sourceforge">iptstate</remote-id>
diff --git a/net-analyzer/isic/metadata.xml b/net-analyzer/isic/metadata.xml
index 78637d83fee..60d26bacb0e 100644
--- a/net-analyzer/isic/metadata.xml
+++ b/net-analyzer/isic/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">isic</remote-id>
</upstream>
diff --git a/net-analyzer/jffnms/metadata.xml b/net-analyzer/jffnms/metadata.xml
index c174f0301ef..0566ec8912e 100644
--- a/net-analyzer/jffnms/metadata.xml
+++ b/net-analyzer/jffnms/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">jffnms</remote-id>
</upstream>
diff --git a/net-analyzer/jmx2munin/metadata.xml b/net-analyzer/jmx2munin/metadata.xml
index d0e3162ce1e..bf91f7be8ce 100644
--- a/net-analyzer/jmx2munin/metadata.xml
+++ b/net-analyzer/jmx2munin/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>java</herd>
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">gentoo/jmx2munin</remote-id>
</upstream>
diff --git a/net-analyzer/jnettop/metadata.xml b/net-analyzer/jnettop/metadata.xml
index 07768d7e05b..2992f52eac5 100644
--- a/net-analyzer/jnettop/metadata.xml
+++ b/net-analyzer/jnettop/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>A top like console network traffic visualiser</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/knocker/metadata.xml b/net-analyzer/knocker/metadata.xml
index 566c8ae56e6..e0c71ce6d03 100644
--- a/net-analyzer/knocker/metadata.xml
+++ b/net-analyzer/knocker/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">knocker</remote-id>
</upstream>
diff --git a/net-analyzer/labrea/metadata.xml b/net-analyzer/labrea/metadata.xml
index ac7bafe98b6..bc943cd801f 100644
--- a/net-analyzer/labrea/metadata.xml
+++ b/net-analyzer/labrea/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>'Sticky' Honeypot and IDS</longdescription>
<upstream>
<remote-id type="sourceforge">labrea</remote-id>
diff --git a/net-analyzer/lft/metadata.xml b/net-analyzer/lft/metadata.xml
index b7434eafd0b..d5c9b7dddc6 100644
--- a/net-analyzer/lft/metadata.xml
+++ b/net-analyzer/lft/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>Layer Four Traceroute: an advanced traceroute implementation</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/libnasl/metadata.xml b/net-analyzer/libnasl/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/libnasl/metadata.xml
+++ b/net-analyzer/libnasl/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-analyzer/lilac/metadata.xml b/net-analyzer/lilac/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/lilac/metadata.xml
+++ b/net-analyzer/lilac/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-analyzer/macchanger/metadata.xml b/net-analyzer/macchanger/metadata.xml
index 62d945e496a..406b0f026d3 100644
--- a/net-analyzer/macchanger/metadata.xml
+++ b/net-analyzer/macchanger/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>netmon</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="github">alobbs/macchanger</remote-id>
</upstream>
diff --git a/net-analyzer/masscan/metadata.xml b/net-analyzer/masscan/metadata.xml
index dad8fc69984..1878a65edef 100644
--- a/net-analyzer/masscan/metadata.xml
+++ b/net-analyzer/masscan/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>netmon</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription lang="en">
This is the fastest Internet port scanner. It can scan the
entire Internet in under 6 minutes, transmitting 10 million
diff --git a/net-analyzer/mate-netspeed/metadata.xml b/net-analyzer/mate-netspeed/metadata.xml
index fcdaefc0d9b..416ec0faae8 100644
--- a/net-analyzer/mate-netspeed/metadata.xml
+++ b/net-analyzer/mate-netspeed/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>mate</herd>
+ <maintainer>
+ <email>mate@gentoo.org</email>
+ <name>Gentoo MATE Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">mate-desktop/mate-netspeed</remote-id>
</upstream>
diff --git a/net-analyzer/mbrowse/metadata.xml b/net-analyzer/mbrowse/metadata.xml
index 4541d09b486..0c268422143 100644
--- a/net-analyzer/mbrowse/metadata.xml
+++ b/net-analyzer/mbrowse/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">mbrowse</remote-id>
</upstream>
diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 7ea1123efd9..4a222db9733 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/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>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
@@ -12,6 +11,10 @@
<name>Michael Orlitzky</name>
<description>Secondary maintainer. Please CC on bugs.</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="dns">
Install <pkg>net-dns/bind-tools</pkg> required for monitoring
diff --git a/net-analyzer/mping/metadata.xml b/net-analyzer/mping/metadata.xml
index 075e21f113b..4f14f22533b 100644
--- a/net-analyzer/mping/metadata.xml
+++ b/net-analyzer/mping/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>
UNINETTs delay statistics for IPv6 is now up and
running as a test project. The main goal with this
diff --git a/net-analyzer/mrtg-ping-probe/metadata.xml b/net-analyzer/mrtg-ping-probe/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/mrtg-ping-probe/metadata.xml
+++ b/net-analyzer/mrtg-ping-probe/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-analyzer/mrtg/metadata.xml b/net-analyzer/mrtg/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/mrtg/metadata.xml
+++ b/net-analyzer/mrtg/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-analyzer/mtr/metadata.xml b/net-analyzer/mtr/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-analyzer/mtr/metadata.xml
+++ b/net-analyzer/mtr/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-analyzer/multimon-ng/metadata.xml b/net-analyzer/multimon-ng/metadata.xml
index 1bd4de7592a..9970c04f871 100644
--- a/net-analyzer/multimon-ng/metadata.xml
+++ b/net-analyzer/multimon-ng/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>
<upstream>
diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 503344e28a4..4b98ad6cec2 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/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>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<longdescription lang="en">
Munin the tool surveys all your computers and remembers what it saw. It
presents all the information in in graphs through a web interface. Its
diff --git a/net-analyzer/nagios-check_dnssec/metadata.xml b/net-analyzer/nagios-check_dnssec/metadata.xml
index f54283e06f3..2856194152b 100644
--- a/net-analyzer/nagios-check_dnssec/metadata.xml
+++ b/net-analyzer/nagios-check_dnssec/metadata.xml
@@ -11,6 +11,12 @@
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/net-analyzer/nagios-check_fail2ban/metadata.xml b/net-analyzer/nagios-check_fail2ban/metadata.xml
index 87a73df9a44..c0104668059 100644
--- a/net-analyzer/nagios-check_fail2ban/metadata.xml
+++ b/net-analyzer/nagios-check_fail2ban/metadata.xml
@@ -11,7 +11,10 @@
<name>Samuel Damashek</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">hollow/check_fail2ban</remote-id>
</upstream>
diff --git a/net-analyzer/nagios-check_glsa2/metadata.xml b/net-analyzer/nagios-check_glsa2/metadata.xml
index 0475fa3cf10..98186e5c759 100644
--- a/net-analyzer/nagios-check_glsa2/metadata.xml
+++ b/net-analyzer/nagios-check_glsa2/metadata.xml
@@ -11,8 +11,14 @@
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">craig/check_glsa2</remote-id>
</upstream>
diff --git a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
index 6a909e30ad1..a445fad78e7 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
+++ b/net-analyzer/nagios-check_ipmi_sensor/metadata.xml
@@ -10,6 +10,12 @@
<name>Werner Fischer</name>
<description>Upstream Maintainer (please CC on bugs)</description>
</maintainer>
- <herd>sysadmin</herd>
- <herd>proxy-maintainers</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/net-analyzer/nagios-check_logfiles/metadata.xml b/net-analyzer/nagios-check_logfiles/metadata.xml
index bd3ce7ca0b6..45bc981e1bf 100644
--- a/net-analyzer/nagios-check_logfiles/metadata.xml
+++ b/net-analyzer/nagios-check_logfiles/metadata.xml
@@ -16,6 +16,12 @@
<name>Nicholas Vinson</name>
<description>Proxy maintainer to be assigned bugs</description>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/net-analyzer/nagios-check_mysql_health/metadata.xml b/net-analyzer/nagios-check_mysql_health/metadata.xml
index b38d16492bd..d2001e3508c 100644
--- a/net-analyzer/nagios-check_mysql_health/metadata.xml
+++ b/net-analyzer/nagios-check_mysql_health/metadata.xml
@@ -1,8 +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>andrew@ahamilto.net</email>
<name>Andrew Hamilton</name>
@@ -20,4 +18,8 @@
<name>Samuel Damashek</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-analyzer/nagios-check_pidfile/metadata.xml b/net-analyzer/nagios-check_pidfile/metadata.xml
index c162eb10843..8e21b3f7427 100644
--- a/net-analyzer/nagios-check_pidfile/metadata.xml
+++ b/net-analyzer/nagios-check_pidfile/metadata.xml
@@ -11,7 +11,10 @@
<name>Samuel Damashek</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">hollow/check_pidfile</remote-id>
</upstream>
diff --git a/net-analyzer/nagios-check_rbl/metadata.xml b/net-analyzer/nagios-check_rbl/metadata.xml
index 02495dc6cb8..f6b42d8b99e 100644
--- a/net-analyzer/nagios-check_rbl/metadata.xml
+++ b/net-analyzer/nagios-check_rbl/metadata.xml
@@ -15,6 +15,12 @@
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index 78b30f7c65e..c0d10a676a9 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -15,8 +15,14 @@
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<longdescription>
Nagios is a host and service monitor designed to inform you of
network problems before your clients, end-users or managers do. It
diff --git a/net-analyzer/nagios-plugins-flameeyes/metadata.xml b/net-analyzer/nagios-plugins-flameeyes/metadata.xml
index 6baa383f513..5783557264c 100644
--- a/net-analyzer/nagios-plugins-flameeyes/metadata.xml
+++ b/net-analyzer/nagios-plugins-flameeyes/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>sysadmin</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<use>
<flag name="smart">
Install <pkg>sys-apps/smartmontools</pkg> required for
diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml
index f54283e06f3..2856194152b 100644
--- a/net-analyzer/nagios-plugins-snmp/metadata.xml
+++ b/net-analyzer/nagios-plugins-snmp/metadata.xml
@@ -11,6 +11,12 @@
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 2eba13de7b1..9eddfd3c6bf 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -16,8 +16,14 @@
<name>Michael Orlitzky</name>
<description>Maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<use>
<flag name="nagios-dns">
Install <pkg>net-dns/bind-tools</pkg> required for monitoring
diff --git a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
index bee3b9073f9..7aa22c80641 100644
--- a/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
+++ b/net-analyzer/nagios-sap-ccms-plugin/metadata.xml
@@ -11,8 +11,14 @@
<name>Chris Reffett</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">nagios-sap-ccms</remote-id>
</upstream>
diff --git a/net-analyzer/nagios/metadata.xml b/net-analyzer/nagios/metadata.xml
index 1e6f4b5c1fc..87d52f0ff0c 100644
--- a/net-analyzer/nagios/metadata.xml
+++ b/net-analyzer/nagios/metadata.xml
@@ -15,8 +15,14 @@
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
- <herd>proxy-maintainers</herd>
- <herd>sysadmin</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<longdescription>
Nagios is a host and service monitor designed to inform you
of network problems before your clients, end-users or
diff --git a/net-analyzer/nagircbot/metadata.xml b/net-analyzer/nagircbot/metadata.xml
index d7649f4b8eb..e4a40fb82a9 100644
--- a/net-analyzer/nagircbot/metadata.xml
+++ b/net-analyzer/nagircbot/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>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-analyzer/nagstamon/metadata.xml b/net-analyzer/nagstamon/metadata.xml
index 7c361088203..05be79d00cf 100644
--- a/net-analyzer/nagstamon/metadata.xml
+++ b/net-analyzer/nagstamon/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>sysadmin</herd>
<maintainer>
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
</maintainer>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">nagstamon</remote-id>
<remote-id type="github">HenriWahl/nagstamon</remote-id>
diff --git a/net-analyzer/namebench/metadata.xml b/net-analyzer/namebench/metadata.xml
index bdfeb7adc6e..fdee50885e8 100644
--- a/net-analyzer/namebench/metadata.xml
+++ b/net-analyzer/namebench/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="google-code">namebench</remote-id>
</upstream>
diff --git a/net-analyzer/nast/metadata.xml b/net-analyzer/nast/metadata.xml
index 5587ee404f3..8088de48dd3 100644
--- a/net-analyzer/nast/metadata.xml
+++ b/net-analyzer/nast/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">nast.berlios</remote-id>
</upstream>
diff --git a/net-analyzer/nbtscan/metadata.xml b/net-analyzer/nbtscan/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/nbtscan/metadata.xml
+++ b/net-analyzer/nbtscan/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-analyzer/nbwmon/metadata.xml b/net-analyzer/nbwmon/metadata.xml
index 851dce2b7fa..d96f61e501f 100644
--- a/net-analyzer/nbwmon/metadata.xml
+++ b/net-analyzer/nbwmon/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="github">causes-/nbwmon</remote-id>
</upstream>
diff --git a/net-analyzer/ndoutils/metadata.xml b/net-analyzer/ndoutils/metadata.xml
index c8b1c872b13..4c6e8086dbc 100644
--- a/net-analyzer/ndoutils/metadata.xml
+++ b/net-analyzer/ndoutils/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">nagios</remote-id>
</upstream>
diff --git a/net-analyzer/ndsad/metadata.xml b/net-analyzer/ndsad/metadata.xml
index 251ca58e234..4c1e333f80c 100644
--- a/net-analyzer/ndsad/metadata.xml
+++ b/net-analyzer/ndsad/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">
The NetUP ndsad (NetUp Data Stream Accounting Daemon) utility captures
IP-traffic from network interfaces and export NetFlow v.5. Data is
diff --git a/net-analyzer/nepenthes/metadata.xml b/net-analyzer/nepenthes/metadata.xml
index bab70ebde71..af9c9fc7611 100644
--- a/net-analyzer/nepenthes/metadata.xml
+++ b/net-analyzer/nepenthes/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">
Nepenthes is a low interaction honeypot that captures worms by emulating
known vulnerabilities.
diff --git a/net-analyzer/nessus-bin/metadata.xml b/net-analyzer/nessus-bin/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/nessus-bin/metadata.xml
+++ b/net-analyzer/nessus-bin/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-analyzer/nessus-client/metadata.xml b/net-analyzer/nessus-client/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/nessus-client/metadata.xml
+++ b/net-analyzer/nessus-client/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-analyzer/nessus-core/metadata.xml b/net-analyzer/nessus-core/metadata.xml
index b4c5e4abe56..28617c0ee35 100644
--- a/net-analyzer/nessus-core/metadata.xml
+++ b/net-analyzer/nessus-core/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>A remote security scanner for Linux (nessus-core)</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/nessus-libraries/metadata.xml b/net-analyzer/nessus-libraries/metadata.xml
index 6f2576670f1..9c61f0b2f47 100644
--- a/net-analyzer/nessus-libraries/metadata.xml
+++ b/net-analyzer/nessus-libraries/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>A remote security scanner for Linux (nessus-libraries)</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/nessus-plugins/metadata.xml b/net-analyzer/nessus-plugins/metadata.xml
index 59050fce4a9..68500b4bf01 100644
--- a/net-analyzer/nessus-plugins/metadata.xml
+++ b/net-analyzer/nessus-plugins/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>A remote security scanner for Linux (nessus-plugins)</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/nessus/metadata.xml b/net-analyzer/nessus/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/nessus/metadata.xml
+++ b/net-analyzer/nessus/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-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index f80008f9416..bdef877fc33 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/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="elf">Enable the use of elf utils to check uptime on some systems</flag>
<flag name="mfd-rewrites">Use MFD rewrites of mib modules where available</flag>
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 82bb1b15a78..72fe9c90307 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/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>netmon</herd>
<maintainer>
<email>vapier@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription>the network swiss army knife</longdescription>
<upstream>
<remote-id type="sourceforge">nc110</remote-id>
diff --git a/net-analyzer/netcat6/metadata.xml b/net-analyzer/netcat6/metadata.xml
index c10568fa29b..9d35c441098 100644
--- a/net-analyzer/netcat6/metadata.xml
+++ b/net-analyzer/netcat6/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">netcat6</remote-id>
</upstream>
diff --git a/net-analyzer/netdiscover/metadata.xml b/net-analyzer/netdiscover/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/netdiscover/metadata.xml
+++ b/net-analyzer/netdiscover/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-analyzer/nethogs/metadata.xml b/net-analyzer/nethogs/metadata.xml
index 312bf770c96..9445b182c48 100644
--- a/net-analyzer/nethogs/metadata.xml
+++ b/net-analyzer/nethogs/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>
NetHogs is a small 'net top' tool. Instead of breaking the traffic down
per protocol or per subnet, like most tools do, it groups bandwidth by
diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml
index fce9bd0bf3c..3aebb7e5c9c 100644
--- a/net-analyzer/neti/metadata.xml
+++ b/net-analyzer/neti/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">neti</remote-id>
</upstream>
diff --git a/net-analyzer/netio/metadata.xml b/net-analyzer/netio/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/netio/metadata.xml
+++ b/net-analyzer/netio/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-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index a1ef8d5871d..9f6fe3720a3 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/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="demo">Emit interim results during the run. May affect results</flag>
<flag name="sctp">Include tests to measure SCTP performance</flag>
diff --git a/net-analyzer/netselect/metadata.xml b/net-analyzer/netselect/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/netselect/metadata.xml
+++ b/net-analyzer/netselect/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-analyzer/nettop/metadata.xml b/net-analyzer/nettop/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/nettop/metadata.xml
+++ b/net-analyzer/nettop/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-analyzer/netwag/metadata.xml b/net-analyzer/netwag/metadata.xml
index 296a5fe0864..5027a72edb9 100644
--- a/net-analyzer/netwag/metadata.xml
+++ b/net-analyzer/netwag/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>Toolbox of 222 utilities for testing Ethernet/IP networks</longdescription>
<upstream>
<remote-id type="sourceforge">ntwag</remote-id>
diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
index 9eaa421b5d2..12602f4ec98 100644
--- a/net-analyzer/netwatch/metadata.xml
+++ b/net-analyzer/netwatch/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>netmon</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+<maintainer>
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
</pkgmetadata>
diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml
index 3f4f876e43f..7b2e7d1a997 100644
--- a/net-analyzer/netwox/metadata.xml
+++ b/net-analyzer/netwox/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>Toolbox of over 400 utilities for testing Ethernet/IP networks</longdescription>
<upstream>
<remote-id type="sourceforge">ntwox</remote-id>
diff --git a/net-analyzer/nfdump/metadata.xml b/net-analyzer/nfdump/metadata.xml
index d7261b287da..b2c7b0b920d 100644
--- a/net-analyzer/nfdump/metadata.xml
+++ b/net-analyzer/nfdump/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="readpcap">Build nfcapd collector to read from pcap file instead ofnetwork data</flag>
<flag name="compat15">Enable read support for nfdump data files created with nfdump 1.5.x</flag>
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
index 1c87217ecd4..f54d1f42455 100644
--- a/net-analyzer/ngrep/metadata.xml
+++ b/net-analyzer/ngrep/metadata.xml
@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>jpr5+gentoo@darkridge.com</email>
<name>Jordan Ritter</name>
<description>Program author who would like to be notified of bugs</description>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ngrep</remote-id>
</upstream>
diff --git a/net-analyzer/nload/metadata.xml b/net-analyzer/nload/metadata.xml
index 43ff7546736..fcdeee5abcc 100644
--- a/net-analyzer/nload/metadata.xml
+++ b/net-analyzer/nload/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-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 97a75ac8cff..23bb98edf8d 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/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="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
<flag name="lua">Include support for the Nmap Scripting Engine (NSE)</flag>
diff --git a/net-analyzer/nmapsi/metadata.xml b/net-analyzer/nmapsi/metadata.xml
index c60e84a8334..14547b17ac6 100644
--- a/net-analyzer/nmapsi/metadata.xml
+++ b/net-analyzer/nmapsi/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">nmapsi4</remote-id>
<remote-id type="sourceforge">nmapsi</remote-id>
diff --git a/net-analyzer/nodebrain/metadata.xml b/net-analyzer/nodebrain/metadata.xml
index d646f58f7bd..50722ae019b 100644
--- a/net-analyzer/nodebrain/metadata.xml
+++ b/net-analyzer/nodebrain/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">nodebrain</remote-id>
</upstream>
diff --git a/net-analyzer/nrpe/metadata.xml b/net-analyzer/nrpe/metadata.xml
index 144670b5c30..b97877f841b 100644
--- a/net-analyzer/nrpe/metadata.xml
+++ b/net-analyzer/nrpe/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>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<longdescription>
A daemon for allowing Nagios to connect directly to servers and
execute commands defined in a centralized configuration file.
diff --git a/net-analyzer/nsat/metadata.xml b/net-analyzer/nsat/metadata.xml
index e98921b44b4..50205b2e8c1 100644
--- a/net-analyzer/nsat/metadata.xml
+++ b/net-analyzer/nsat/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>Network Security Analysis Tool, an application-level network security scanner</longdescription>
<upstream>
<remote-id type="sourceforge">nsat</remote-id>
diff --git a/net-analyzer/nsca/metadata.xml b/net-analyzer/nsca/metadata.xml
index 6d4d98e4d90..5bac87cea85 100644
--- a/net-analyzer/nsca/metadata.xml
+++ b/net-analyzer/nsca/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>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<longdescription lang="en">
This program is designed to accept passive service check results
from clients that use the send_nsca utility (which is included in
diff --git a/net-analyzer/nstats/metadata.xml b/net-analyzer/nstats/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/nstats/metadata.xml
+++ b/net-analyzer/nstats/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-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
index bea1d84c9d5..bb3e6f6bad1 100644
--- a/net-analyzer/ntop/metadata.xml
+++ b/net-analyzer/ntop/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>ntop is a network traffic probe that shows the network usage,
similar to what the popular top Unix command does. ntop is based on libpcap
and it has been written in a portable way in order to virtually run on every
diff --git a/net-analyzer/nttcp/metadata.xml b/net-analyzer/nttcp/metadata.xml
index 5051377f5ab..f7ee654536a 100644
--- a/net-analyzer/nttcp/metadata.xml
+++ b/net-analyzer/nttcp/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>tool to test TCP and UDP throughput</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/odhcploc/metadata.xml b/net-analyzer/odhcploc/metadata.xml
index 52ec285119d..57ccbcb5b9d 100644
--- a/net-analyzer/odhcploc/metadata.xml
+++ b/net-analyzer/odhcploc/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>netmon</herd>
<maintainer>
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/net-analyzer/oinkmaster/metadata.xml b/net-analyzer/oinkmaster/metadata.xml
index caf45de8548..cc7064aa854 100644
--- a/net-analyzer/oinkmaster/metadata.xml
+++ b/net-analyzer/oinkmaster/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">oinkmaster</remote-id>
</upstream>
diff --git a/net-analyzer/p0f/metadata.xml b/net-analyzer/p0f/metadata.xml
index 44b3cbf4558..beb8daaee09 100644
--- a/net-analyzer/p0f/metadata.xml
+++ b/net-analyzer/p0f/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>p0f performs passive OS detection based on SYN packets.</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/packit/metadata.xml b/net-analyzer/packit/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/packit/metadata.xml
+++ b/net-analyzer/packit/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-analyzer/pathload/metadata.xml b/net-analyzer/pathload/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/pathload/metadata.xml
+++ b/net-analyzer/pathload/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-analyzer/pbnj/metadata.xml b/net-analyzer/pbnj/metadata.xml
index b19dcc35034..539b5487f6c 100644
--- a/net-analyzer/pbnj/metadata.xml
+++ b/net-analyzer/pbnj/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>jabra@ccs.neu.edu</email>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pbnj</remote-id>
</upstream>
diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml
index 5eb21ecd6bf..99bc8105a58 100644
--- a/net-analyzer/pinger/metadata.xml
+++ b/net-analyzer/pinger/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="gtk2">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:2</pkg></flag>
<flag name="gtk3">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:3</pkg></flag>
diff --git a/net-analyzer/pktstat/metadata.xml b/net-analyzer/pktstat/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/pktstat/metadata.xml
+++ b/net-analyzer/pktstat/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-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index e7682c9dd62..49d7e86b41a 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/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="geoipv2">Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
<flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
diff --git a/net-analyzer/pnp4nagios/metadata.xml b/net-analyzer/pnp4nagios/metadata.xml
index 36a72c70d31..29377207a88 100644
--- a/net-analyzer/pnp4nagios/metadata.xml
+++ b/net-analyzer/pnp4nagios/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>sysadmin</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pnp4nagios</remote-id>
</upstream>
diff --git a/net-analyzer/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/portmon/metadata.xml
+++ b/net-analyzer/portmon/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-analyzer/portsentry/metadata.xml b/net-analyzer/portsentry/metadata.xml
index cedb9f45ac4..c9568be5721 100644
--- a/net-analyzer/portsentry/metadata.xml
+++ b/net-analyzer/portsentry/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">sentrytools</remote-id>
</upstream>
diff --git a/net-analyzer/postal/metadata.xml b/net-analyzer/postal/metadata.xml
index 940fde8f70c..cf7950eb855 100644
--- a/net-analyzer/postal/metadata.xml
+++ b/net-analyzer/postal/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-analyzer/pypacker/metadata.xml b/net-analyzer/pypacker/metadata.xml
index 5c2b33cc747..20afb184853 100644
--- a/net-analyzer/pypacker/metadata.xml
+++ b/net-analyzer/pypacker/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="github">mike01/pypacker</remote-id>
<maintainer>
diff --git a/net-analyzer/quidscor/metadata.xml b/net-analyzer/quidscor/metadata.xml
index 8452310f8b7..c83b3351067 100644
--- a/net-analyzer/quidscor/metadata.xml
+++ b/net-analyzer/quidscor/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">quidscor</remote-id>
</upstream>
diff --git a/net-analyzer/rain/metadata.xml b/net-analyzer/rain/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/rain/metadata.xml
+++ b/net-analyzer/rain/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-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
index 0bfa612138f..a463cfc257c 100644
--- a/net-analyzer/ripe-atlas-tools/metadata.xml
+++ b/net-analyzer/ripe-atlas-tools/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.tools</remote-id>
</upstream>
diff --git a/net-analyzer/rrdcollect/metadata.xml b/net-analyzer/rrdcollect/metadata.xml
index 477804ead86..95cff0eceb5 100644
--- a/net-analyzer/rrdcollect/metadata.xml
+++ b/net-analyzer/rrdcollect/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="exec">Enable exec:/// support</flag>
<flag name="librrd">Use the librrd library from <pkg>net-analyzer/rrdtool</pkg></flag>
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index b184b8ed4be..fca655c1dba 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/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="graph">Enable support for graphing functions</flag>
<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
index c6bd53688f0..e452a4d4e2d 100644
--- a/net-analyzer/sancp/metadata.xml
+++ b/net-analyzer/sancp/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="sguil">Enable sguil (The Analyst Console for Network Security Monitoring) support</flag>
</use>
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index b3c471b62d0..7ea602b1238 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/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>Sarg - Squid Analysis Report Generator is a tool that allow
you to view "where" your users are going to on the Internet. Sarg provides many
informations about Squid users activities: times, bytes, sites, etc...
diff --git a/net-analyzer/sbd/metadata.xml b/net-analyzer/sbd/metadata.xml
index 6b3d934caee..bb8533126ba 100644
--- a/net-analyzer/sbd/metadata.xml
+++ b/net-analyzer/sbd/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>
sbd is a Netcat-clone, designed to be portable and offer strong encryption. It
features AES-CBC-128 + HMAC-SHA1 encryption (by Christophe Devine), program
diff --git a/net-analyzer/scanlogd/metadata.xml b/net-analyzer/scanlogd/metadata.xml
index d65c0f39012..4fdf0b9ee62 100644
--- a/net-analyzer/scanlogd/metadata.xml
+++ b/net-analyzer/scanlogd/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="nids">Use <pkg>net-libs/libnids</pkg> for packet capturing</flag>
<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
diff --git a/net-analyzer/scanssh/metadata.xml b/net-analyzer/scanssh/metadata.xml
index 4a05ae080d1..753c1bfa8a4 100644
--- a/net-analyzer/scanssh/metadata.xml
+++ b/net-analyzer/scanssh/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>netmon</herd>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
<longdescription>Scanssh protocol scanner - scans a list of addresses an networks for running SSH protocol servers and their version numbers.</longdescription>
</pkgmetadata>
diff --git a/net-analyzer/scapy/metadata.xml b/net-analyzer/scapy/metadata.xml
index 47c0b3f3002..1edffb1631d 100644
--- a/net-analyzer/scapy/metadata.xml
+++ b/net-analyzer/scapy/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>netmon</herd>
<maintainer>
<email>ikelos@gentoo.org</email>
<name>Mike Auty</name>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription lang="en">
Scapy is a powerful interactive packet manipulation program.
</longdescription>
diff --git a/net-analyzer/scli/metadata.xml b/net-analyzer/scli/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-analyzer/scli/metadata.xml
+++ b/net-analyzer/scli/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-analyzer/sec/metadata.xml b/net-analyzer/sec/metadata.xml
index b32074cc7f8..3a36d21f869 100644
--- a/net-analyzer/sec/metadata.xml
+++ b/net-analyzer/sec/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">simple-evcorr</remote-id>
</upstream>
diff --git a/net-analyzer/sflowtool/metadata.xml b/net-analyzer/sflowtool/metadata.xml
index 43ff7546736..fcdeee5abcc 100644
--- a/net-analyzer/sflowtool/metadata.xml
+++ b/net-analyzer/sflowtool/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-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml
index 32d7038bdbd..d08e3b8a76c 100644
--- a/net-analyzer/sguil-client/metadata.xml
+++ b/net-analyzer/sguil-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>netmon</herd>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="github">bammv/sguil</remote-id>
<remote-id type="sourceforge">sguil</remote-id>
diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml
index 32d7038bdbd..d08e3b8a76c 100644
--- a/net-analyzer/sguil-sensor/metadata.xml
+++ b/net-analyzer/sguil-sensor/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="github">bammv/sguil</remote-id>
<remote-id type="sourceforge">sguil</remote-id>
diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml
index 32d7038bdbd..d08e3b8a76c 100644
--- a/net-analyzer/sguil-server/metadata.xml
+++ b/net-analyzer/sguil-server/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="github">bammv/sguil</remote-id>
<remote-id type="sourceforge">sguil</remote-id>
diff --git a/net-analyzer/sinfo/metadata.xml b/net-analyzer/sinfo/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/sinfo/metadata.xml
+++ b/net-analyzer/sinfo/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-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/siphon/metadata.xml
+++ b/net-analyzer/siphon/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-analyzer/slurm/metadata.xml b/net-analyzer/slurm/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/slurm/metadata.xml
+++ b/net-analyzer/slurm/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-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index 28e51faef9e..be50b1d1685 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/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="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
<flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
diff --git a/net-analyzer/sniffit/metadata.xml b/net-analyzer/sniffit/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/sniffit/metadata.xml
+++ b/net-analyzer/sniffit/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-analyzer/snmptt/metadata.xml b/net-analyzer/snmptt/metadata.xml
index f01e891b3e8..56fcb6916ab 100644
--- a/net-analyzer/snmptt/metadata.xml
+++ b/net-analyzer/snmptt/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>SNMP Trap Translator</longdescription>
<upstream>
<remote-id type="sourceforge">snmptt</remote-id>
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index a4a3e5c199d..f1264ba75be 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
@@ -13,6 +11,14 @@
<name>Jason Wallace</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Snort is an open source network intrusion prevention and detection
system (IDS/IPS) developed by Sourcefire. Combining the benefits of
diff --git a/net-analyzer/snortalog/metadata.xml b/net-analyzer/snortalog/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/snortalog/metadata.xml
+++ b/net-analyzer/snortalog/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-analyzer/snortsam/metadata.xml b/net-analyzer/snortsam/metadata.xml
index 43ff7546736..fcdeee5abcc 100644
--- a/net-analyzer/snortsam/metadata.xml
+++ b/net-analyzer/snortsam/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-analyzer/softflowd/metadata.xml b/net-analyzer/softflowd/metadata.xml
index bf548f3b7c7..377b96b6c6a 100644
--- a/net-analyzer/softflowd/metadata.xml
+++ b/net-analyzer/softflowd/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="google-code">softflowd</remote-id>
</upstream>
diff --git a/net-analyzer/sqlninja/metadata.xml b/net-analyzer/sqlninja/metadata.xml
index 0206b2411de..5d16ffe240b 100644
--- a/net-analyzer/sqlninja/metadata.xml
+++ b/net-analyzer/sqlninja/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>netmon</herd>
<maintainer>
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
+ <maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sqlninja</remote-id>
</upstream>
diff --git a/net-analyzer/squid-graph/metadata.xml b/net-analyzer/squid-graph/metadata.xml
index 0fad16e7dba..bdc41c6ac38 100644
--- a/net-analyzer/squid-graph/metadata.xml
+++ b/net-analyzer/squid-graph/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>Squid logfile analyzer and traffic grapher</longdescription>
<upstream>
<remote-id type="sourceforge">squid-graph</remote-id>
diff --git a/net-analyzer/squidsites/metadata.xml b/net-analyzer/squidsites/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/squidsites/metadata.xml
+++ b/net-analyzer/squidsites/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-analyzer/ssldump/metadata.xml b/net-analyzer/ssldump/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/ssldump/metadata.xml
+++ b/net-analyzer/ssldump/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-analyzer/ssmping/metadata.xml b/net-analyzer/ssmping/metadata.xml
index b5353e0b229..dbe54ab223e 100644
--- a/net-analyzer/ssmping/metadata.xml
+++ b/net-analyzer/ssmping/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>venaas@uninett.no</email>
<name>Stig Venaas (upstream)</name>
</maintainer>
+<maintainer>
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/net-analyzer/symon/metadata.xml b/net-analyzer/symon/metadata.xml
index 3e0971b990e..107c91ffef2 100644
--- a/net-analyzer/symon/metadata.xml
+++ b/net-analyzer/symon/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="perl">Enables a generic perl symux client</flag>
<flag name="symon">Enables the system monitor. Offers no functionality
diff --git a/net-analyzer/syweb/metadata.xml b/net-analyzer/syweb/metadata.xml
index 78692635ad2..8b51961892f 100644
--- a/net-analyzer/syweb/metadata.xml
+++ b/net-analyzer/syweb/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-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 9ec6ed4d389..1dba729c5ef 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/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="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
diff --git a/net-analyzer/tcpflow/metadata.xml b/net-analyzer/tcpflow/metadata.xml
index ff0e9e7f0ed..2bb80e93807 100644
--- a/net-analyzer/tcpflow/metadata.xml
+++ b/net-analyzer/tcpflow/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="pcap">Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
</use>
diff --git a/net-analyzer/tcpreen/metadata.xml b/net-analyzer/tcpreen/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/tcpreen/metadata.xml
+++ b/net-analyzer/tcpreen/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-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index d098016ba67..43ac8de13f5 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/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>
Tcpreplay is a suite of utilities for UNIX systems for editing and replaying
network traffic which was previously captured by tools like tcpdump and
diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml
index 1926505a3d6..68fdf83cb8b 100644
--- a/net-analyzer/tcpslice/metadata.xml
+++ b/net-analyzer/tcpslice/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="github">the-tcpdump-group/tcpslice</remote-id>
</upstream>
diff --git a/net-analyzer/tcpstat/metadata.xml b/net-analyzer/tcpstat/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/tcpstat/metadata.xml
+++ b/net-analyzer/tcpstat/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-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/tcptrace/metadata.xml
+++ b/net-analyzer/tcptrace/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-analyzer/tcptraceroute/metadata.xml b/net-analyzer/tcptraceroute/metadata.xml
index 61d0b3e9889..a15be3b227b 100644
--- a/net-analyzer/tcptraceroute/metadata.xml
+++ b/net-analyzer/tcptraceroute/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="github">mct/tcptraceroute</remote-id>
</upstream>
diff --git a/net-analyzer/tcptrack/metadata.xml b/net-analyzer/tcptrack/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/tcptrack/metadata.xml
+++ b/net-analyzer/tcptrack/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-analyzer/thcrut/metadata.xml b/net-analyzer/thcrut/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/thcrut/metadata.xml
+++ b/net-analyzer/thcrut/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-analyzer/tleds/metadata.xml b/net-analyzer/tleds/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/tleds/metadata.xml
+++ b/net-analyzer/tleds/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-analyzer/tptest/metadata.xml b/net-analyzer/tptest/metadata.xml
index 496929f4d0d..b07ac726d9e 100644
--- a/net-analyzer/tptest/metadata.xml
+++ b/net-analyzer/tptest/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">tptest</remote-id>
</upstream>
diff --git a/net-analyzer/tracebox/metadata.xml b/net-analyzer/tracebox/metadata.xml
index 18403fc4878..ea873d67462 100644
--- a/net-analyzer/tracebox/metadata.xml
+++ b/net-analyzer/tracebox/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="github">tracebox/tracebox</remote-id>
</upstream>
diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml
index da78704d1fb..9ca1b5e93d3 100644
--- a/net-analyzer/traceproto/metadata.xml
+++ b/net-analyzer/traceproto/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">traceproto</remote-id>
</upstream>
diff --git a/net-analyzer/traceroute-nanog/metadata.xml b/net-analyzer/traceroute-nanog/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/traceroute-nanog/metadata.xml
+++ b/net-analyzer/traceroute-nanog/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-analyzer/traceroute/metadata.xml b/net-analyzer/traceroute/metadata.xml
index dc8a43461a3..2286f198e7f 100644
--- a/net-analyzer/traceroute/metadata.xml
+++ b/net-analyzer/traceroute/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>Utility to trace the route of IP packets</longdescription>
<upstream>
<remote-id type="sourceforge">traceroute</remote-id>
diff --git a/net-analyzer/trafshow/metadata.xml b/net-analyzer/trafshow/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/trafshow/metadata.xml
+++ b/net-analyzer/trafshow/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-analyzer/ttcp/metadata.xml b/net-analyzer/ttcp/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/ttcp/metadata.xml
+++ b/net-analyzer/ttcp/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-analyzer/upnpscan/metadata.xml b/net-analyzer/upnpscan/metadata.xml
index c059e1ca5cd..70dc193a83e 100644
--- a/net-analyzer/upnpscan/metadata.xml
+++ b/net-analyzer/upnpscan/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>
A tool that scans the LAN or a given address range for UPnP capable
devices. This is done by sending M-SEARCH discovery packets to either
diff --git a/net-analyzer/vnstat/metadata.xml b/net-analyzer/vnstat/metadata.xml
index ff2cafb5d05..ec83004f63d 100644
--- a/net-analyzer/vnstat/metadata.xml
+++ b/net-analyzer/vnstat/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>
vnStat is a network traffic monitor for Linux that keeps a log of daily
network traffic for the selected interface(s). vnStat isn't a packet sniffer.
diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
index 7095e0e64b8..740d57b7b5b 100644
--- a/net-analyzer/w3af/metadata.xml
+++ b/net-analyzer/w3af/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>clabbe.montjoie@gmail.com</email>
<name>LABBE Corentin (Montjoie)</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/net-analyzer/webfuzzer/metadata.xml b/net-analyzer/webfuzzer/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/webfuzzer/metadata.xml
+++ b/net-analyzer/webfuzzer/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-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index b80d8aa8813..ae047c6f033 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/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>
Wireshark is the world's foremost network protocol analyzer, and is the de
facto (and often de jure) standard across many industries and educational
diff --git a/net-analyzer/xnetload/metadata.xml b/net-analyzer/xnetload/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/xnetload/metadata.xml
+++ b/net-analyzer/xnetload/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-analyzer/xprobe/metadata.xml b/net-analyzer/xprobe/metadata.xml
index b17f052c15e..fef0bbe355d 100644
--- a/net-analyzer/xprobe/metadata.xml
+++ b/net-analyzer/xprobe/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>
Active OS fingerprinting tool. This is the new xprobe, called xprobe2, due to
xprobe1 being obsoleted. xprobe2 has a different approach to OS fingerprinting.
diff --git a/net-analyzer/yersinia/metadata.xml b/net-analyzer/yersinia/metadata.xml
index cc554b32314..1ac8c08887f 100644
--- a/net-analyzer/yersinia/metadata.xml
+++ b/net-analyzer/yersinia/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>
Yersinia is a network tool designed to take advantage of some weakeness
in different network protocols. It intends to be a solid framework for
diff --git a/net-analyzer/zniper/metadata.xml b/net-analyzer/zniper/metadata.xml
index 03aa50bab7e..9fa8050550d 100644
--- a/net-analyzer/zniper/metadata.xml
+++ b/net-analyzer/zniper/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>