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.

9 files changed, 33 insertions, 10 deletions

diff --git a/net-dns/cagibi/metadata.xml b/net-dns/cagibi/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/net-dns/cagibi/metadata.xml
+++ b/net-dns/cagibi/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-dns/dnrd/metadata.xml b/net-dns/dnrd/metadata.xml
index 0e1cbf4d4486..29720a21c68f 100644
--- a/net-dns/dnrd/metadata.xml
+++ b/net-dns/dnrd/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>natanael.copa@gmail.com</email>
 		<name>Natanael Copa</name>
@@ -9,6 +8,10 @@
 	<maintainer>
 		<email>armin76@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 Domain Name Relay Daemon is a caching, forwarding DNS proxy server. Most useful on vpn or dialup firewalls but it is also a nice DNS cache for minor networks and workstations.
 </longdescription>
diff --git a/net-dns/dnstop/metadata.xml b/net-dns/dnstop/metadata.xml
index 14b05fb0dd81..2e5d57f7725f 100644
--- a/net-dns/dnstop/metadata.xml
+++ b/net-dns/dnstop/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>hendrik@consetetur.de</email>
   <name>Hendrik v. Raven</name>
@@ -10,6 +9,10 @@
   <email>xmw@gentoo.org</email>
   <name>Michael Weber</name>
 </maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
 <upstream>
   <changelog>http://dns.measurement-factory.com/tools/dnstop/src/CHANGES</changelog>
   <doc>http://dns.measurement-factory.com/tools/dnstop/dnstop.8.html</doc>
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 29256af3d08f..31e7cef563d4 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/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>ondrej@sury.org</email>
 		<name>Ondřej Surý</name>
@@ -9,6 +8,10 @@
 	<maintainer>
 		<email>scarabeus@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+	        <email>proxy-maint@gentoo.org</email>
+	        <name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="dnstap">Include support for the dnstap
 		binary log format (http://dnstap.info/).
diff --git a/net-dns/noip-updater/metadata.xml b/net-dns/noip-updater/metadata.xml
index 94476e896b19..a074b5250949 100644
--- a/net-dns/noip-updater/metadata.xml
+++ b/net-dns/noip-updater/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>boothfsec@gmail.com</email>
 		<name>Francis Booth</name>
 		<description>Active Maintainer, Assign bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		no-ip.com dynamic DNS updater
 	</longdescription>
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index 50e414a3472e..224194b89f0a 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/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>tom@whyscream.net</email>
 		<name>Tom Hendrikx</name>
@@ -12,6 +11,10 @@
 		<name>Wolfram Schlich</name>
 		<description>proxy-maintainer, please CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="bind8-stats">Enables BIND8 like NSTATS and XSTATS</flag>
 		<flag name="libevent">Use libevent or libev, useful when zone
diff --git a/net-dns/pdnsd/metadata.xml b/net-dns/pdnsd/metadata.xml
index 9996eab0bb17..e2d756c746a6 100644
--- a/net-dns/pdnsd/metadata.xml
+++ b/net-dns/pdnsd/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
-    <maintainer>
+  <maintainer>
       <email>polynomial-c@gentoo.org</email>
       <name>Lars Wendler</name>
     </maintainer>
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 3c419c0c2375..7d68ec18b53e 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/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>mschiff@gentoo.org</email>
     <name>Marc Schiffbauer</name>
@@ -11,6 +10,10 @@
     <description>Proxied developer. Please CC on bugs.</description>
     <name>TANABE Ken-ichi</name>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   Unbound is a validating, recursive, and caching DNS resolver.
 
diff --git a/net-dns/validns/metadata.xml b/net-dns/validns/metadata.xml
index cce03d071dbf..94de178247a8 100644
--- a/net-dns/validns/metadata.xml
+++ b/net-dns/validns/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>tom@whyscream.net</email>
 		<name>Tom Hendrikx</name>
@@ -12,5 +11,9 @@
 		<name>Wolfram Schlich</name>
 		<description>proxy-maintainer, please CC on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>Validns is a standalone command line RFC 1034/1035 zone file validation tool that, in addition to basic syntactic and semantic zone checks, includes DNSSEC signature verification and NSEC/NSEC3 chain validation, as well a number of optional policy checks on the zone.</longdescription>
 </pkgmetadata>