Replace all herds with appropriate projects (GLEP 67)

Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.

20 files changed, 92 insertions, 23 deletions

diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index 2491879fd846..520e40c219b0 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/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>proxy-maintainers</herd>
 <maintainer>
 	<email>erkiferenc@gmail.com</email>
 	<name>Ferenc Erki</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <use>
 	<flag name="plugins">Install optional plugins</flag>
 </use>
diff --git a/net-firewall/arptables/metadata.xml b/net-firewall/arptables/metadata.xml
index 23b2d799bbe8..1174960a6169 100644
--- a/net-firewall/arptables/metadata.xml
+++ b/net-firewall/arptables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ebtables</remote-id>
 	</upstream>
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index 5c490dd32d99..c1301934f032 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-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">
 		A set of tools targeted at system administrators. They are conntrack,
 		the userspace command line interface, and conntrackd, the userspace
diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
index fd59ecdb05ab..9ed11df9fecf 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="perl">Install the ebtables-save script which uses perl</flag>
 	</use>
diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 94ccf5421619..26ec802cbb7e 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -10,7 +10,10 @@
 		<email>cardoe@gentoo.org</email>
 		<name>Doug Goldstein</name>
 	</maintainer>
-	<herd>virtualization</herd>
+	<maintainer>
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 	<use>
 		<flag name="gui">Builds and installs GUI configurator and GTK+ applet</flag>
 	</use>
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index cc8a621efcda..01324129795f 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/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>proxy-maintainers</herd>
 	<maintainer>
 		<email>itumaykin+gentoo@gmail.com</email>
 		<name>Coacher</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="client">Build fwknop client</flag>
 		<flag name="extras">Install example AppArmor policy for fwknopd server</flag>
diff --git a/net-firewall/gshield/metadata.xml b/net-firewall/gshield/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-firewall/gshield/metadata.xml
+++ b/net-firewall/gshield/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-firewall/ipt_netflow/metadata.xml b/net-firewall/ipt_netflow/metadata.xml
index e2cd4f38e85b..46819600629a 100644
--- a/net-firewall/ipt_netflow/metadata.xml
+++ b/net-firewall/ipt_netflow/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">ipt-netflow</remote-id>
 	</upstream>
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index 76e1b58763af..454f3551fb80 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer>
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
 	<flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
 	<flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
diff --git a/net-firewall/itval/metadata.xml b/net-firewall/itval/metadata.xml
index 4a3f9593bd0a..bd070a1ff00b 100644
--- a/net-firewall/itval/metadata.xml
+++ b/net-firewall/itval/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">itval</remote-id>
 	</upstream>
diff --git a/net-firewall/lutelwall/metadata.xml b/net-firewall/lutelwall/metadata.xml
index 8a0d713fe48d..92ed100751bf 100644
--- a/net-firewall/lutelwall/metadata.xml
+++ b/net-firewall/lutelwall/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>tomek@lutel.pl</email>
     <name>Tomek Lutelmowski</name>
     <description>LuteWall developer, third party maintainer</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>
 LutelWall is high-level firewall configuration tool. It uses human-readable and easy 
 to understand configuration to set up Netfilter in most secure way. Its flexibility 
diff --git a/net-firewall/nfacct/metadata.xml b/net-firewall/nfacct/metadata.xml
index 78692635ad22..8b51961892ff 100644
--- a/net-firewall/nfacct/metadata.xml
+++ b/net-firewall/nfacct/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-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml
index 38fd447bdc5e..015a68319428 100644
--- a/net-firewall/nftables/metadata.xml
+++ b/net-firewall/nftables/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>base-system</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
@@ -12,4 +10,12 @@
 		<name>Nicholas Vinson</name>
 		<description>Proxy maintainer to be assigned bugs</description>
 	</maintainer>
+<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/nufw/metadata.xml b/net-firewall/nufw/metadata.xml
index b44aca536691..af6610a35d73 100644
--- a/net-firewall/nufw/metadata.xml
+++ b/net-firewall/nufw/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="nfconntrack">Use netfilter_conntrack</flag>
 <flag name="nfqueue">Use NFQUEUE instead of QUEUE</flag>
diff --git a/net-firewall/pftop/metadata.xml b/net-firewall/pftop/metadata.xml
index 49ee990318f8..bd3c6911f5f4 100644
--- a/net-firewall/pftop/metadata.xml
+++ b/net-firewall/pftop/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>bsd</herd>
+	<maintainer>
+		<email>bsd@gentoo.org</email>
+		<name>BSD Project</name>
+	</maintainer>
 	<use>
 		<flag name="altq">Enable altq(4) support — alternate queuing of network packets.</flag>
 	</use>
diff --git a/net-firewall/psad/metadata.xml b/net-firewall/psad/metadata.xml
index 03aa50bab7e3..9fa8050550d6 100644
--- a/net-firewall/psad/metadata.xml
+++ b/net-firewall/psad/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-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index b05083f3a6ea..dce27eea7fd4 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/metadata.xml
@@ -1,12 +1,18 @@
 <?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>whissi@whissi.de</email>
     <name>Thomas D. (Whissi)</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>
   <use>
     <flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
     <flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
diff --git a/net-firewall/ufw-frontends/metadata.xml b/net-firewall/ufw-frontends/metadata.xml
index 9de1f77c1793..129b46d3c841 100644
--- a/net-firewall/ufw-frontends/metadata.xml
+++ b/net-firewall/ufw-frontends/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>proxy-maintainers</herd>
 	<maintainer>
 		<email>slawomir.nizio@sabayon.org</email>
 		<name>Sławomir Nizio</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">Currently, UFW provides only a command-line interface (CLI) for user
 	interaction--the ufw command. This project implements graphical frontends
 	for UFW using PyGTK and PyQt (the latter in early stage of development).</longdescription>
diff --git a/net-firewall/ufw/metadata.xml b/net-firewall/ufw/metadata.xml
index afc7f7197388..985a52e13371 100644
--- a/net-firewall/ufw/metadata.xml
+++ b/net-firewall/ufw/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>proxy-maintainers</herd>
 	<maintainer>
 		<email>slawomir.nizio@sabayon.org</email>
 		<name>Sławomir Nizio</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 	The Uncomplicated Firewall (ufw) is a frontend for iptables and is
 	particularly well-suited for host-based firewalls. It provides a framework
diff --git a/net-firewall/xtables-addons/metadata.xml b/net-firewall/xtables-addons/metadata.xml
index 66ec30dcd145..f1f22e9e1aea 100644
--- a/net-firewall/xtables-addons/metadata.xml
+++ b/net-firewall/xtables-addons/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>andreis.vinogradovs@gmail.com</email>
 		<name>Andreis Vinogradovs</name>
@@ -11,6 +10,10 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 Xtables-addons is the successor to patch-o-matic(-ng). Likewise, it contains
 extensions that were not, or are not yet, accepted in the main kernel/iptables